debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Linux rpc problems with new glibc

Browse Source
This commit is contained in:
Ulrich Wilkens
2018-05-31 22:50:44 +02:00
committed by Jon Trulson
parent 16fbb15ecc
commit 07f272122d
49 changed files with 93 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cde/programs/dtinfo/dtinfo/src/Agents/Imakefile
View File

@@ -10,11 +10,13 @@ LIBNAME=Agents
NormalCplusplusObjectRule()
#ifdef DoLicenseManagement
INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) $(MMDB_INCLUDES) $(LICENSE_L_INCLUDES)
INCLUDES = $(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) \
$(MMDB_INCLUDES) $(LICENSE_L_INCLUDES) $(TIRPCINC)
EXTRA_DEFINES=-DLICENSE_MANAGEMENT
#else
XCOMM Should remove LICENSE_L_INCLUDES from this list in this case
INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) $(COMMON_CLASS_INCLUDES)
INCLUDES = $(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) \
$(COMMON_CLASS_INCLUDES) $(TIRPCINC)
#endif
#include "Classlist.mk"

2
cde/programs/dtinfo/dtinfo/src/Agents/MessageAgentMotif.C
View File

@@ -587,7 +587,7 @@ MessageAgent::get_integer (const char *message, const char* title,
{
if (f_dialog == NULL)
create_ui(parent);
if (g_active)
if (g_active)
return (100);
g_active = TRUE;

2
cde/programs/dtinfo/dtinfo/src/Basic/OrderList.C
View File

@@ -97,7 +97,7 @@ OrderList::add(ListEntry *node, AddCode where, bool mvcursor)
else
return OLIST_ERROR;
f_size++;
f_size++;
return OLIST_OK;
}

3
cde/programs/dtinfo/dtinfo/src/Imakefile
View File

@@ -48,7 +48,8 @@ SYS_LIBRARIES=-lm -L$(XPROJECTROOT)/lib -L$(MPROJECTROOT)/lib
SYS_LIBRARIES=-lm
#endif
INCLUDES = $(CXXDEPENDINCLUDES) -I. $(BROWSER_INCLUDES) $(MMDB_INCLUDES)
INCLUDES = $(CXXDEPENDINCLUDES) -I. $(BROWSER_INCLUDES) $(MMDB_INCLUDES) \
$(TIRPCINC)
OLIASNORMALLIBS= \
Agents/libAgents.a \

3
cde/programs/dtinfo/dtinfo/src/Managers/Imakefile
View File

@@ -23,7 +23,8 @@ LIBNAME=Managers
NormalCplusplusObjectRule()
INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) $(COMMON_CLASS_INCLUDES)
INCLUDES = $(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) \
$(COMMON_CLASS_INCLUDES) $(TIRPCINC)
#include "Classlist.mk"

2
cde/programs/dtinfo/dtinfo/src/Managers/NodeMgr.C
View File

@@ -345,7 +345,7 @@ NodeMgr::load(UAS_Pointer<UAS_Common> &node_ptr)
{
style_sheet_mgr().initOnlineStyleSheet(node_ptr);
}
mcatch_noarg (StyleSheetSyntaxError)
mcatch_noarg (StyleSheetSyntaxError&)
{
message_mgr().error_dialog(
(char*)UAS_String(CATGETS(Set_Messages, 39, "File a Bug")));

2
cde/programs/dtinfo/dtinfo/src/Managers/PrintMgr.C
View File

@@ -209,7 +209,7 @@ PrintMgr::load(UAS_Pointer<UAS_Common> &node_ptr)
{
style_sheet_mgr().initPrintStyleSheet(node_ptr);
}
mcatch_noarg (StyleSheetSyntaxError)
mcatch_noarg (StyleSheetSyntaxError&)
{
message_mgr().error_dialog(
(char*)UAS_String(CATGETS(Set_Messages, 39,

4
cde/programs/dtinfo/dtinfo/src/Managers/StyleSheetMgr.C
View File

@@ -163,7 +163,7 @@ StyleSheetMgr::initOnlineStyleSheet (UAS_Pointer<UAS_Common> &doc) {
mtry {
styleparse ();
}
mcatch_noarg (StyleSheetSyntaxError) {
mcatch_noarg (StyleSheetSyntaxError&) {
fLastSS = 0;
delete fCurrent;
{ // Don't remove these curlies. For destructors before rethrow
@@ -221,7 +221,7 @@ StyleSheetMgr::initPrintStyleSheet (UAS_Pointer<UAS_Common> &doc) {
mtry {
styleparse ();
}
mcatch_noarg (StyleSheetSyntaxError) {
mcatch_noarg (StyleSheetSyntaxError&) {
fLastSS = 0;
delete fCurrent;
{ // Don't remove these curlies. For destructors before rethrow

22
cde/programs/dtinfo/dtinfo/src/Registration.hh
View File

@@ -1,25 +1,3 @@
/*
* CDE - Common Desktop Environment
*
* Copyright (c) 1993-2012, The Open Group. All rights reserved.
*
* These libraries and programs are free software; you can
* redistribute them and/or modify them under the terms of the GNU
* Lesser General Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at your option)
* any later version.
*
* These libraries and programs are distributed in the hope that
* they will be useful, but WITHOUT ANY WARRANTY; without even the
* implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU Lesser General Public License for more
* details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with these libraries and programs; if not, write
* to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
* Floor, Boston, MA 02110-1301 USA
*/
#define Set_CatMgr 1
#define Set_DtSR_Parser 2
#define Set_SearchMgr 3

8
cde/programs/dtinfo/dtinfo/src/cgm/cgmcmds.c
View File

@@ -930,7 +930,7 @@ static int auxcolr(dat_ptr, cmd_ptr, cgm_s)
case I_C_M: cgm_s->auxcolr[3] = b_guint(&dat_ptr, cgm_s->cindprec);
break;
case D_C_M: for (i=0; i<3; ++i)
cgm_s->auxcolr[i] = b_gsint(&dat_ptr, cgm_s->colprec);
cgm_s->auxcolr[i] = b_gsint(&dat_ptr, cgm_s->colprec);
break;
}
return 1;
@@ -2334,10 +2334,10 @@ static int corient(unsigned char *dat_ptr,struct cmd_info_s *cmd_ptr,
/* just 4 VDC's to grab */
switch (cgm_s->vdctype) {
case VDC_INT: for (i=0; i<4; ++i)
cgm_s->corient[i].i = b_gsint(&dat_ptr, cgm_s->vdcintprec);
cgm_s->corient[i].i = b_gsint(&dat_ptr, cgm_s->vdcintprec);
break;
case VDC_REAL: for (i=0; i<4; ++i)
cgm_s->corient[i].r = b_real(&dat_ptr, &(cgm_s->vdcrprec));
case VDC_REAL: for (i=0; i<4; ++i)
cgm_s->corient[i].r = b_real(&dat_ptr, &(cgm_s->vdcrprec));
break;
}
return 1;