From 2b8b5f25b5108a47cce83a303034fedbb1717501 Mon Sep 17 00:00:00 2001 From: Ulrich Wilkens Date: Sat, 9 May 2015 00:14:52 +0200 Subject: [PATCH] Support for new Solaris/OpenIndiana versions --- cde/config/cf/sun.cf | 15 +- cde/databases/CDE-HELP-LOC.src | 71 ----- cde/databases/CDE-INFOLIB-LOC.src | 48 --- cde/databases/CDE-LOC.src | 372 ----------------------- cde/databases/CDE-MSG-LOC.src | 71 ----- cde/lib/DtSearch/raima/Imakefile | 2 +- cde/programs/dtcalc/functions.c | 4 +- cde/programs/dtcm/server/Imakefile | 2 +- cde/programs/dtlogin/config/Xsession.src | 3 + cde/programs/dtlogin/dm.h | 2 +- cde/programs/dtlogin/util.c | 42 --- cde/programs/dtmail/dtmailpr/Imakefile | 2 +- cde/programs/nsgmls/Imakefile | 1 - cde/programs/nsgmls/assert.C | 2 +- 14 files changed, 21 insertions(+), 616 deletions(-) diff --git a/cde/config/cf/sun.cf b/cde/config/cf/sun.cf index 9b646a8a..4c53beba 100644 --- a/cde/config/cf/sun.cf +++ b/cde/config/cf/sun.cf @@ -205,11 +205,14 @@ XCOMM Gnu C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion # elif OSMinorVersion > 3 # define InstallCmd /usr/ucb/install # endif -# ifdef i386Architecture -# define StandardDefines -Dsun -Di386 -DSVR4 -D__i386 +# if defined(i386Architecture) +# define StandardDefines -Dsun -Di386 -DSVR4 -D__i386 # define ToolkitStringsABIOptions -intelabi +# elif defined(SparcArchitecture) +# define StandardDefines -Dsun -Dsparc -DSVR4 -D__sparc +# define ToolkitStringsABIOptions -sparcabi # else -# define StandardDefines -Dsun -DSVR4 +# define StandardDefines -Dsun -DSVR4 # define ToolkitStringsABIOptions -sparcabi # endif # define ExtraLibraries -lsocket -lnsl @@ -279,7 +282,7 @@ XCOMM Gnu C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion # if HasGcc2 # define SharedLibraryLoadFlags -shared # define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIRPATH) -# ifdef i386Architecture +# if defined(i386Architecture) || defined(SparcArchitecture) # define CcCmd gcc # endif # else @@ -375,6 +378,10 @@ man_keywords:: @@\ #define DtWidgetDefines DtSearchDefines #define DtPrintDefines DtSearchDefines +#ifndef CompressAllFonts +#define CompressAllFonts YES +#endif + /* For DtHelp TIFF processing routines. */ #if defined(AMD64Architecture) || defined(i386Architecture) #define LSBBitOrder YES diff --git a/cde/databases/CDE-HELP-LOC.src b/cde/databases/CDE-HELP-LOC.src index 91f21ba3..0050483f 100644 --- a/cde/databases/CDE-HELP-LOC.src +++ b/cde/databases/CDE-HELP-LOC.src @@ -2999,77 +2999,6 @@ XCOMM ######################################################################### #endif #endif /* _AIX */ -XCOMM ######################################################################### -XCOMM -XCOMM Sun - Locale and platform specific entries -XCOMM -XCOMM ######################################################################### -#ifdef sparc -#ifdef _GERMAN_ -/usr/dt/appconfig/help/de_DE.ISO8859-1 -{ sun - install_target = /usr/dt/appconfig/help/de - type = sym_link -} -#endif -#ifdef _SPANISH_ -/usr/dt/appconfig/help/es_ES.ISO8859-1 -{ sun - install_target = /usr/dt/appconfig/help/es - type = sym_link -} -#endif -#ifdef _FRENCH_ -/usr/dt/appconfig/help/fr_FR.ISO8859-1 -{ sun - install_target = /usr/dt/appconfig/help/fr - type = sym_link -} -#endif -#ifdef _ITALIAN_ -/usr/dt/appconfig/help/it_IT.ISO8859-1 -{ sun - install_target = /usr/dt/appconfig/help/it - type = sym_link -} -#endif -#ifdef _JAPANESE_ -/usr/dt/appconfig/help/ja_JP.dt-eucJP -{ sun - install_target = /usr/dt/appconfig/help/ja - type = sym_link -} -#endif -#ifdef _KOREAN_ -/usr/dt/appconfig/help/ko_KR.dt-eucKR -{ sun - install_target = /usr/dt/appconfig/help/ko - type = sym_link -} -#endif -#ifdef _SWEDISH_ -/usr/dt/appconfig/help/sv_SE.ISO8859-1 -{ sun - install_target = /usr/dt/appconfig/help/sv - type = sym_link -} -#endif -#ifdef _CHINESE_ -/usr/dt/appconfig/help/zh_CN.dt-eucCN -{ sun - install_target = /usr/dt/appconfig/help/zh - type = sym_link -} -#endif -#ifdef _TAIWANESE_ -/usr/dt/appconfig/help/zh_TW.dt-eucTW -{ sun - install_target = /usr/dt/appconfig/help/zh_TW - type = sym_link -} -#endif -#endif /* SVR4 */ - XCOMM ######################################################################### XCOMM XCOMM Novell - Locale and platform specific entries diff --git a/cde/databases/CDE-INFOLIB-LOC.src b/cde/databases/CDE-INFOLIB-LOC.src index aba25f84..24b7b49b 100644 --- a/cde/databases/CDE-INFOLIB-LOC.src +++ b/cde/databases/CDE-INFOLIB-LOC.src @@ -504,54 +504,6 @@ XCOMM ########################################################################## #endif /* _AIX */ -XCOMM ########################################################################## -XCOMM -XCOMM Sun - Locale and platform specific entries -XCOMM -XCOMM ########################################################################## -#ifdef sparc -#ifdef _GERMAN_ -../infolib/de_DE.ISO8859-1 -{ sun - install_target = /usr/dt/infolib/de - type = sym_link -} -#endif - -#ifdef _SPANISH_ -../infolib/es_ES.ISO8859-1 -{ sun - install_target = /usr/dt/infolib/es - type = sym_link -} -#endif - -#ifdef _FRENCH_ -../infolib/fr_FR.ISO8859-1 -{ sun - install_target = /usr/dt/infolib/fr - type = sym_link -} -#endif - -#ifdef _ITALIAN_ -../infolib/it_IT.ISO8859-1 -{ sun - install_target = /usr/dt/infolib/it - type = sym_link -} -#endif - -#ifdef _JAPANESE_ -../infolib/ja_JP.dt-eucJP -{ sun - install_target = /usr/dt/infolib/ja - type = sym_link -} -#endif - -#endif /* SVR4 */ - XCOMM ########################################################################## XCOMM XCOMM Novell - Locale and platform specific entries diff --git a/cde/databases/CDE-LOC.src b/cde/databases/CDE-LOC.src index 6fade41f..1780bac6 100644 --- a/cde/databases/CDE-LOC.src +++ b/cde/databases/CDE-LOC.src @@ -1711,378 +1711,6 @@ programs/dtimsstart/conf/aix/none #endif #endif /* _AIX */ -XCOMM ########################################################################## -XCOMM -XCOMM Sun - Locale and platform specific entries -XCOMM -XCOMM ########################################################################## -#ifdef sparc -#ifdef _GERMAN_ -./de_DE.ISO8859-1 -{ sun - install_target = /usr/dt/app-defaults/de - type = sym_link -} -./de_DE.ISO8859-1 -{ sun - install_target = /usr/dt/appconfig/appmanager/de - type = sym_link -} -./de_DE.ISO8859-1 -{ sun - install_target = /usr/dt/appconfig/types/de - type = sym_link -} -./de_DE.ISO8859-1 -{ sun - install_target = /usr/dt/config/de - type = sym_link -} -./desc.de_DE.ISO8859-1 -{ sun - install_target = /usr/dt/share/palettes/desc.de - type = sym_link -} -./desc.de_DE.ISO8859-1 -{ sun - install_target = /usr/dt/share/backdrops/desc.de - type = sym_link -} -./de_DE.ISO8859-1 -{ sun - install_target = /usr/dt/share/examples/types/de - type = sym_link -} -#endif -#ifdef _SPANISH_ -./es_ES.ISO8859-1 -{ sun - install_target = /usr/dt/app-defaults/es - type = sym_link -} -./es_ES.ISO8859-1 -{ sun - install_target = /usr/dt/appconfig/appmanager/es - type = sym_link -} -./es_ES.ISO8859-1 -{ sun - install_target = /usr/dt/appconfig/types/es - type = sym_link -} -./es_ES.ISO8859-1 -{ sun - install_target = /usr/dt/config/es - type = sym_link -} -./desc.es_ES.ISO8859-1 -{ sun - install_target = /usr/dt/share/palettes/desc.es - type = sym_link -} -./desc.es_ES.ISO8859-1 -{ sun - install_target = /usr/dt/share/backdrops/desc.es - type = sym_link -} -./es_ES.ISO8859-1 -{ sun - install_target = /usr/dt/share/examples/types/es - type = sym_link -} -#endif -#ifdef _FRENCH_ -./fr_FR.ISO8859-1 -{ sun - install_target = /usr/dt/app-defaults/fr - type = sym_link -} -./fr_FR.ISO8859-1 -{ sun - install_target = /usr/dt/appconfig/appmanager/fr - type = sym_link -} -./fr_FR.ISO8859-1 -{ sun - install_target = /usr/dt/appconfig/types/fr - type = sym_link -} -./fr_FR.ISO8859-1 -{ sun - install_target = /usr/dt/config/fr - type = sym_link -} -./desc.fr_FR.ISO8859-1 -{ sun - install_target = /usr/dt/share/palettes/desc.fr - type = sym_link -} -./desc.fr_FR.ISO8859-1 -{ sun - install_target = /usr/dt/share/backdrops/desc.fr - type = sym_link -} -./fr_FR.ISO8859-1 -{ sun - install_target = /usr/dt/share/examples/types/fr - type = sym_link -} -#endif -#ifdef _ITALIAN_ -./it_IT.ISO8859-1 -{ sun - install_target = /usr/dt/app-defaults/it - type = sym_link -} -./it_IT.ISO8859-1 -{ sun - install_target = /usr/dt/appconfig/appmanager/it - type = sym_link -} -./it_IT.ISO8859-1 -{ sun - install_target = /usr/dt/appconfig/types/it - type = sym_link -} -./it_IT.ISO8859-1 -{ sun - install_target = /usr/dt/config/it - type = sym_link -} -./desc.it_IT.ISO8859-1 -{ sun - install_target = /usr/dt/share/palettes/desc.it - type = sym_link -} -./desc.it_IT.ISO8859-1 -{ sun - install_target = /usr/dt/share/backdrops/desc.it - type = sym_link -} -./it_IT.ISO8859-1 -{ sun - install_target = /usr/dt/share/examples/types/it - type = sym_link -} -#endif -#ifdef _JAPANESE_ -./ja_JP.dt-eucJP -{ sun - install_target = /usr/dt/app-defaults/ja - type = sym_link -} -./ja_JP.dt-eucJP -{ sun - install_target = /usr/dt/appconfig/appmanager/ja - type = sym_link -} -./ja_JP.dt-eucJP -{ sun - install_target = /usr/dt/appconfig/types/ja - type = sym_link -} -./ja_JP.dt-eucJP -{ sun - install_target = /usr/dt/config/ja - type = sym_link -} -./desc.ja_JP.dt-eucJP -{ sun - install_target = /usr/dt/share/palettes/desc.ja - type = sym_link -} -./desc.ja_JP.dt-eucJP -{ sun - install_target = /usr/dt/share/backdrops/desc.ja - type = sym_link -} -./ja_JP.dt-eucJP -{ sun - install_target = /usr/dt/share/examples/types/ja - type = sym_link -} -XCOMM -XCOMM dtimsstart configuration files -XCOMM -programs/dtimsstart/conf/hpux/ja_JP.eucJP -{ sun - install_target = /usr/dt/config/ims/ja -} -programs/dtimsstart/conf/hpux/xjim -{ sun - install_target = /usr/dt/config/ims/xjim -} -programs/dtimsstart/conf/hpux/atok8 -{ sun - install_target = /usr/dt/config/ims/atok8 -} -programs/dtimsstart/conf/hpux/vje -{ sun - install_target = /usr/dt/config/ims/vje -} -programs/dtimsstart/conf/hpux/egb -{ sun - install_target = /usr/dt/config/ims/egb -} -programs/dtimsstart/conf/hpux/builtin.jpn -{ sun - install_target = /usr/dt/config/ims/builtin.jpn -} -programs/dtimsstart/conf/hpux/none -{ sun - install_target = /usr/dt/config/ims/none -} -#endif -#ifdef _KOREAN_ -./ko_KR.dt-eucKR -{ sun - install_target = /usr/dt/app-defaults/ko - type = sym_link -} -./ko_KR.dt-eucKR -{ sun - install_target = /usr/dt/appconfig/appmanager/ko - type = sym_link -} -./ko_KR.dt-eucKR -{ sun - install_target = /usr/dt/appconfig/types/ko - type = sym_link -} -./ko_KR.dt-eucKR -{ sun - install_target = /usr/dt/config/ko - type = sym_link -} -./desc.ko_KR.dt-eucKR -{ sun - install_target = /usr/dt/share/palettes/desc.ko - type = sym_link -} -./desc.ko_KR.dt-eucKR -{ sun - install_target = /usr/dt/share/backdrops/desc.ko - type = sym_link -} -./ko_KR.dt-eucKR -{ sun - install_target = /usr/dt/share/examples/types/ko - type = sym_link -} -#endif -#ifdef _SWEDISH_ -./sv_SE.ISO8859-1 -{ sun - install_target = /usr/dt/app-defaults/sv - type = sym_link -} -./sv_SE.ISO8859-1 -{ sun - install_target = /usr/dt/appconfig/appmanager/sv - type = sym_link -} -./sv_SE.ISO8859-1 -{ sun - install_target = /usr/dt/appconfig/types/sv - type = sym_link -} -./sv_SE.ISO8859-1 -{ sun - install_target = /usr/dt/config/sv - type = sym_link -} -./desc.sv_SE.ISO8859-1 -{ sun - install_target = /usr/dt/share/palettes/desc.sv - type = sym_link -} -./desc.sv_SE.ISO8859-1 -{ sun - install_target = /usr/dt/share/backdrops/desc.sv - type = sym_link -} -./sv_SE.ISO8859-1 -{ sun - install_target = /usr/dt/share/examples/types/sv - type = sym_link -} -#endif -#ifdef _CHINESE_ -./zh_CN.dt-eucCN -{ sun - install_target = /usr/dt/app-defaults/zh - type = sym_link -} -./zh_CN.dt-eucCN -{ sun - install_target = /usr/dt/appconfig/appmanager/zh - type = sym_link -} -./zh_CN.dt-eucCN -{ sun - install_target = /usr/dt/appconfig/types/zh - type = sym_link -} -./zh_CN.dt-eucCN -{ sun - install_target = /usr/dt/config/zh - type = sym_link -} -./desc.zh_CN.dt-eucCN -{ sun - install_target = /usr/dt/share/palettes/desc.zh - type = sym_link -} -./desc.zh_CN.dt-eucCN -{ sun - install_target = /usr/dt/share/backdrops/desc.zh - type = sym_link -} -./zh_CN.dt-eucCN -{ sun - install_target = /usr/dt/share/examples/types/zh - type = sym_link -} -#endif -#ifdef _TAIWANESE_ -./zh_TW.dt-eucTW -{ sun - install_target = /usr/dt/app-defaults/zh_TW - type = sym_link -} -./zh_TW.dt-eucTW -{ sun - install_target = /usr/dt/appconfig/appmanager/zh_TW - type = sym_link -} -./zh_TW.dt-eucTW -{ sun - install_target = /usr/dt/appconfig/types/zh_TW - type = sym_link -} -./zh_TW.dt-eucTW -{ sun - install_target = /usr/dt/config/zh_TW - type = sym_link -} -./desc.zh_TW.dt-eucTW -{ sun - install_target = /usr/dt/share/palettes/desc.zh_TW - type = sym_link -} -./desc.zh_TW.dt-eucTW -{ sun - install_target = /usr/dt/share/backdrops/desc.zh_TW - type = sym_link -} -./zh_TW.dt-eucTW -{ sun - install_target = /usr/dt/share/examples/types/zh_TW - type = sym_link -} -#endif -#endif /* SVR4 */ - XCOMM ########################################################################## XCOMM XCOMM Novell - Locale and platform specific entries diff --git a/cde/databases/CDE-MSG-LOC.src b/cde/databases/CDE-MSG-LOC.src index 20801386..2244fcb8 100644 --- a/cde/databases/CDE-MSG-LOC.src +++ b/cde/databases/CDE-MSG-LOC.src @@ -545,77 +545,6 @@ XCOMM ########################################################################## #endif #endif /* _AIX */ -XCOMM ########################################################################## -XCOMM -XCOMM Sun - Locale and platform specific entries -XCOMM -XCOMM ########################################################################## -#ifdef sparc -#ifdef _GERMAN_ -/usr/dt/lib/nls/msg/de_DE.ISO8859-1 -{ sun - install_target = /usr/dt/lib/nls/msg/de - type = sym_link -} -#endif -#ifdef _SPANISH_ -/usr/dt/lib/nls/msg/es_ES.ISO8859-1 -{ sun - install_target = /usr/dt/lib/nls/msg/es - type = sym_link -} -#endif -#ifdef _FRENCH_ -/usr/dt/lib/nls/msg/fr_FR.ISO8859-1 -{ sun - install_target = /usr/dt/lib/nls/msg/fr - type = sym_link -} -#endif -#ifdef _ITALIAN_ -/usr/dt/lib/nls/msg/it_IT.ISO8859-1 -{ sun - install_target = /usr/dt/lib/nls/msg/it - type = sym_link -} -#endif -#ifdef _JAPANESE_ -/usr/dt/lib/nls/msg/ja_JP.dt-eucJP -{ sun - install_target = /usr/dt/lib/nls/msg/ja - type = sym_link -} -#endif -#ifdef _KOREAN_ -/usr/dt/lib/nls/msg/ko_KR.dt-eucKR -{ sun - install_target = /usr/dt/lib/nls/msg/ko - type = sym_link -} -#endif -#ifdef _SWEDISH_ -/usr/dt/lib/nls/msg/sv_SE.ISO8859-1 -{ sun - install_target = /usr/dt/lib/nls/msg/sv - type = sym_link -} -#endif -#ifdef _CHINESE_ -/usr/dt/lib/nls/msg/zh_CN.dt-eucCN -{ sun - install_target = /usr/dt/lib/nls/msg/zh - type = sym_link -} -#endif -#ifdef _TAIWANESE_ -/usr/dt/lib/nls/msg/zh_TW.dt-eucTW -{ sun - install_target = /usr/dt/lib/nls/msg/zh_TW - type = sym_link -} -#endif -#endif /* SVR4 */ - XCOMM ########################################################################## XCOMM XCOMM Novell - Locale and platform specific entries diff --git a/cde/lib/DtSearch/raima/Imakefile b/cde/lib/DtSearch/raima/Imakefile index b2c9fac3..2b1872be 100644 --- a/cde/lib/DtSearch/raima/Imakefile +++ b/cde/lib/DtSearch/raima/Imakefile @@ -28,7 +28,7 @@ EXTRA_DEFINES = -DBYTE_SWAP -D_XOPEN_SOURCE=700 #endif #if defined(SunArchitecture) -EXTRA_DEFINES = -DBYTE_SWAP -D_XOPEN_SOURCE=700 +EXTRA_DEFINES = -DBYTE_SWAP -D_XOPEN_SOURCE=500 #endif #define DoNormalLib NormalLibDtSearch diff --git a/cde/programs/dtcalc/functions.c b/cde/programs/dtcalc/functions.c index cf548bfa..13133bdd 100644 --- a/cde/programs/dtcalc/functions.c +++ b/cde/programs/dtcalc/functions.c @@ -1729,7 +1729,7 @@ do_round(double result, int ndigits) int temp; if (isnan(result)) return result; -#if defined(_AIX) || defined(__aix) || defined(__osf__) +#if defined(_AIX) || defined(__aix) || defined(__osf__) || defined(__sparc) temp = finite(result); if (!temp) return (temp > 0) ? HUGE : -HUGE; @@ -1849,7 +1849,7 @@ try_compute_i(double guess, double *result, int method) new_w = w - f / f_prime; -#if defined(_AIX) || defined(__aix) || defined (__osf__) +#if defined(_AIX) || defined(__aix) || defined (__osf__) || defined(__sparc) if (!(!isnan(new_w) && finite(new_w))) return FALSE; #else diff --git a/cde/programs/dtcm/server/Imakefile b/cde/programs/dtcm/server/Imakefile index 5722f946..ad77d8e2 100644 --- a/cde/programs/dtcm/server/Imakefile +++ b/cde/programs/dtcm/server/Imakefile @@ -85,7 +85,7 @@ NormalProgramTarget($(PROGRAM),$(OBJS),,$(LOCAL_LIBRARIES),) .y.c: $(YACC) -d $(YFLAGS) $< - sed -e "s/yy/yyy/g" -e "\a# linea D" y.tab.c > $*.c + sed -e "s/yy/yyy/g" -e "/# line/d" y.tab.c > $*.c sed s/yy/yyy/g y.tab.h > $*.h $(RM) y.tab.c y.tab.h diff --git a/cde/programs/dtlogin/config/Xsession.src b/cde/programs/dtlogin/config/Xsession.src index 58e1f8f9..35b65273 100644 --- a/cde/programs/dtlogin/config/Xsession.src +++ b/cde/programs/dtlogin/config/Xsession.src @@ -57,7 +57,10 @@ XCOMM ########################################################################## #elif defined (__hpux) # define cpp_XDMSYS "/usr/lib/X11/xdm/sys.xsession" #elif defined (sun) +# define cpp_XINITUSER "$HOME/.xinitrc" # define cpp_MAIL "/var/mail/$USER" +# undef cpp_HELLO +# define cpp_HELLO "$DT_BINPATH/dthello -file $DT_INSTALL/copyright &" #endif #ifdef __osf__ diff --git a/cde/programs/dtlogin/dm.h b/cde/programs/dtlogin/dm.h index 1c27abca..2569f63a 100644 --- a/cde/programs/dtlogin/dm.h +++ b/cde/programs/dtlogin/dm.h @@ -117,7 +117,7 @@ #define DEF_NLS_DIR "/usr/lib/nls/loc" #elif defined(hpV4) #define DEF_NLS_DIR "/usr/lib/nls/msg" -#elif defined(sun) || defined(__uxp__) || defined(USL) +#elif defined(__uxp__) || defined(USL) #define DEF_NLS_DIR "/usr/lib/locale" #else #define DEF_NLS_DIR CDE_INSTALLATION_TOP "/lib/nls/msg" diff --git a/cde/programs/dtlogin/util.c b/cde/programs/dtlogin/util.c index c41b8edc..ee8a0fcd 100644 --- a/cde/programs/dtlogin/util.c +++ b/cde/programs/dtlogin/util.c @@ -951,48 +951,6 @@ ScanNLSDir(char *dirname) } #endif /* __osf__obsoleted__ */ -#elif defined(sun) -/* - * Scan for installed locales on Sun platform. - */ -{ - DIR *dirp; - struct dirent *dp; - char* filename; - char path1[MAXPATHLEN], path2[MAXPATHLEN]; - struct stat stat1, stat2; - int retval1, retval2; - - /* - * To determin the fully installed locale list, check several locations. - */ - if((dirp = opendir(DEF_X11_NLS_SHARE_DIR)) != NULL) - { - while((dp = readdir(dirp)) != NULL) - { - filename = dp->d_name; - - if ( filename[0] != '.' && - (int)(strlen(languageList) + - strlen(filename) + 2) < LANGLISTSIZE) - { - (void) sprintf(path1, "%s/%s", DEF_X11_NLS_LIB_DIR, filename); - (void) sprintf(path2, "%s/%s", dirname, filename); - retval1 = stat(path1, &stat1); - retval2 = stat(path2, &stat2); - - if ( retval1==0 && retval2==0 && - S_ISDIR(stat1.st_mode) && S_ISDIR(stat2.st_mode) ) - { - strcat(languageList, " "); - strcat(languageList, filename); - } - } - } - closedir(dirp); - } -} - #elif defined(__uxp__) || defined(USL) #define LC_COLLATE "LC_COLLATE" diff --git a/cde/programs/dtmail/dtmailpr/Imakefile b/cde/programs/dtmail/dtmailpr/Imakefile index d380dd4e..171913c6 100644 --- a/cde/programs/dtmail/dtmailpr/Imakefile +++ b/cde/programs/dtmail/dtmailpr/Imakefile @@ -35,7 +35,7 @@ EXTRA_CCOPTIONS += -DSPRO_V2 # endif /* USE_SPRO_V3 */ EXTRA_C++OPTIONS = +p +w $(SPRO_V3_OPTIONS) -MT_LIBS = -i $(C++_LIB) -lm -lw -lc +MT_LIBS = $(C++_LIB) -lm -lw -lc SYS_LIBRARIES = -lintl -lnsl $(MT_LIBS) #endif /* SunArchitecture */ diff --git a/cde/programs/nsgmls/Imakefile b/cde/programs/nsgmls/Imakefile index c1a523bc..1816e02c 100644 --- a/cde/programs/nsgmls/Imakefile +++ b/cde/programs/nsgmls/Imakefile @@ -122,7 +122,6 @@ M4 = /bin/m4 CXXOPTIONS = \ -DSP_VOLATILE= -DSP_CONST= \ -DSP_HAVE_LOCALE -DSP_MULTI_BYTE -DSP_ANSI_CLASS_INST -EXTRA_INCLUDES = -I/opt/SUNWspro/SC2.0.1/include/CC /* * Flags passed into compile step when doing manual template instantiation. diff --git a/cde/programs/nsgmls/assert.C b/cde/programs/nsgmls/assert.C index f0c6e4d7..7a56d3f6 100644 --- a/cde/programs/nsgmls/assert.C +++ b/cde/programs/nsgmls/assert.C @@ -28,7 +28,7 @@ #include #include "macros.h" -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(sun) void exit(int) __attribute__((noreturn)); #endif -- 2.25.1