OpenIndiana and Solaris port
authorUlrich Wilkens <mail@uwilkens.de>
Tue, 28 Oct 2014 18:46:43 +0000 (19:46 +0100)
committerJon Trulson <jon@radscan.com>
Tue, 28 Oct 2014 19:40:11 +0000 (13:40 -0600)
296 files changed:
cde/.gitignore
cde/admin/IntegTools/dbTools/installCDE.src
cde/admin/IntegTools/dbTools/mkProd
cde/admin/IntegTools/post_install/sun/configMin.src
cde/admin/IntegTools/post_install/sun/configRun.src
cde/config/cf/DtInfo.rules
cde/config/cf/Motif.tmpl
cde/config/cf/cde.tmpl
cde/config/cf/site.def
cde/config/cf/sun.cf
cde/config/cf/sunLib.tmpl
cde/config/cf/sv4Lib.rules
cde/config/cf/svr4.cf
cde/config/imake/Imakefile
cde/config/imake/imake.c
cde/config/makedepend/Imakefile
cde/config/makedepend/ifparser.c
cde/config/makedepend/ifparser.h
cde/config/makedepend/main.c
cde/config/makedepend/pr.c
cde/config/util/Imakefile
cde/config/util/makestrs.c
cde/databases/CDE-FONTS.udb
cde/databases/CDE-HELP-RUN.udb
cde/databases/CDE-INFO.udb
cde/databases/CDE-RUN.udb
cde/databases/CDE-SHLIBS.src
cde/lib/DtHelp/Imakefile
cde/lib/DtHelp/SunOS.lcx
cde/lib/DtHelp/il/Imakefile
cde/lib/DtMrm/Imakefile
cde/lib/DtPrint/Imakefile
cde/lib/DtSearch/Imakefile
cde/lib/DtSearch/raima/Imakefile
cde/lib/DtSearch/raima/vista.h
cde/lib/DtSvc/DtEncap/Imakefile
cde/lib/DtSvc/DtUtil1/Imakefile
cde/lib/DtSvc/DtUtil2/Imakefile
cde/lib/DtSvc/Imakefile
cde/lib/DtSvc/include/codelibs/dynarray.h
cde/lib/DtTerm/Term/Imakefile
cde/lib/DtTerm/TermPrim/Imakefile
cde/lib/DtTerm/TermPrim/TermPrimDebug.c
cde/lib/DtTerm/TermView/Imakefile
cde/lib/DtWidget/Imakefile
cde/lib/csa/Imakefile
cde/lib/tt/bin/dbck/Imakefile
cde/lib/tt/bin/tt_type_comp/Imakefile
cde/lib/tt/bin/ttdbserverd/Imakefile
cde/lib/tt/bin/ttdbserverd/db_server_svc.C
cde/lib/tt/bin/ttsession/Imakefile
cde/lib/tt/bin/tttar/Imakefile
cde/lib/tt/bin/tttrace/Imakefile
cde/lib/tt/lib/Imakefile
cde/lib/tt/lib/api/c/Imakefile
cde/lib/tt/lib/db/Imakefile
cde/lib/tt/lib/mp/Imakefile
cde/lib/tt/lib/tt_options.h
cde/lib/tt/lib/tttk/Imakefile
cde/lib/tt/lib/util/Imakefile
cde/lib/tt/lib/util/tt_Xlib.C
cde/lib/tt/lib/util/tt_string.C
cde/lib/tt/mini_isam/Imakefile
cde/lib/tt/mini_isam/iscntl.c
cde/lib/tt/slib/Imakefile
cde/lib/tt/slib/mp_rpc_implement.C
cde/programs/backdrops/SunLogo.pm [new file with mode: 0644]
cde/programs/dtaction/Imakefile
cde/programs/dtappbuilder/src/ab.tmpl
cde/programs/dtappbuilder/src/abmf/Imakefile
cde/programs/dtappbuilder/src/libABil/Imakefile
cde/programs/dtappbuilder/src/libAButil/Imakefile
cde/programs/dtcalc/Imakefile
cde/programs/dtcm/dtcm/Imakefile
cde/programs/dtcm/libDtCmP/Imakefile
cde/programs/dtcreate/Imakefile
cde/programs/dtdocbook/tcl/Imakefile
cde/programs/dtexec/Imakefile
cde/programs/dtfile/Imakefile
cde/programs/dtfile/dtcopy/Imakefile
cde/programs/dthello/Imakefile
cde/programs/dthelp/dthelpdemo/Imakefile
cde/programs/dthelp/dthelpview/Imakefile
cde/programs/dthelp/parser/canon1/build/build.c
cde/programs/dthelp/parser/canon1/build/param.c
cde/programs/dthelp/parser/canon1/build/scan.c
cde/programs/dthelp/parser/canon1/helptag/Imakefile
cde/programs/dthelp/parser/canon1/parser/Imakefile
cde/programs/dthelp/parser/canon1/util/malloc.c
cde/programs/dthelp/parser/pass1/build/build.c
cde/programs/dthelp/parser/pass1/build/param.c
cde/programs/dthelp/parser/pass1/build/scan.c
cde/programs/dthelp/parser/pass1/helptag/Imakefile
cde/programs/dthelp/parser/pass1/parser/Imakefile
cde/programs/dthelp/parser/pass1/util/malloc.c
cde/programs/dthelp/parser/pass2/build/build.c
cde/programs/dthelp/parser/pass2/build/param.c
cde/programs/dthelp/parser/pass2/build/scan.c
cde/programs/dthelp/parser/pass2/htag2/Imakefile
cde/programs/dthelp/parser/pass2/parser/Imakefile
cde/programs/dthelp/parser/pass2/util/malloc.c
cde/programs/dticon/Imakefile
cde/programs/dtinfo/DtMmdb/HardCopy/FPExceptions.h
cde/programs/dtinfo/DtMmdb/HardCopy/autoNumber.C
cde/programs/dtinfo/DtMmdb/Imakefile
cde/programs/dtinfo/DtMmdb/StyleSheet/DocParser.C
cde/programs/dtinfo/DtMmdb/StyleSheet/Expression.C
cde/programs/dtinfo/DtMmdb/StyleSheet/StyleSheetExceptions.h
cde/programs/dtinfo/DtMmdb/StyleSheet/defToken.C
cde/programs/dtinfo/DtMmdb/StyleSheet/tokenStyle.C
cde/programs/dtinfo/DtMmdb/api/Imakefile
cde/programs/dtinfo/DtMmdb/btree/Imakefile
cde/programs/dtinfo/DtMmdb/btree_berkeley/Imakefile
cde/programs/dtinfo/DtMmdb/btree_berkeley/compat.h
cde/programs/dtinfo/DtMmdb/compression/Imakefile
cde/programs/dtinfo/DtMmdb/compression/ps.C
cde/programs/dtinfo/DtMmdb/compression/sgml.C
cde/programs/dtinfo/DtMmdb/diskhash/Imakefile
cde/programs/dtinfo/DtMmdb/diskhash/disk_hash.C
cde/programs/dtinfo/DtMmdb/dstr/Imakefile
cde/programs/dtinfo/DtMmdb/dti_cc/cc_exceptions.h
cde/programs/dtinfo/DtMmdb/dti_excs/Destructable_il.hh
cde/programs/dtinfo/DtMmdb/dti_excs/Exceptions.C
cde/programs/dtinfo/DtMmdb/dti_excs/Imakefile
cde/programs/dtinfo/DtMmdb/dynhash/Imakefile
cde/programs/dtinfo/DtMmdb/dynhash/data_t.C
cde/programs/dtinfo/DtMmdb/hmphf/Imakefile
cde/programs/dtinfo/DtMmdb/index/Imakefile
cde/programs/dtinfo/DtMmdb/index/dyn_index.C
cde/programs/dtinfo/DtMmdb/index/fast_mphf.h
cde/programs/dtinfo/DtMmdb/mgrs/Imakefile
cde/programs/dtinfo/DtMmdb/misc/unique_id.c
cde/programs/dtinfo/DtMmdb/object/Imakefile
cde/programs/dtinfo/DtMmdb/object/long_pstring.h
cde/programs/dtinfo/DtMmdb/oliasdb/Imakefile
cde/programs/dtinfo/DtMmdb/schema/Imakefile
cde/programs/dtinfo/DtMmdb/schema/object_dict.C
cde/programs/dtinfo/DtMmdb/schema/token.C
cde/programs/dtinfo/DtMmdb/storage/Imakefile
cde/programs/dtinfo/DtMmdb/utility/Imakefile
cde/programs/dtinfo/DtMmdb/utility/filebuf.C
cde/programs/dtinfo/DtMmdb/utility/funcs.h
cde/programs/dtinfo/DtMmdb/utility/mmdb_exception.h
cde/programs/dtinfo/DtMmdb/utility/streambuf.C
cde/programs/dtinfo/clients/dtinfo_start/Imakefile
cde/programs/dtinfo/dtinfo/src/Agents/Imakefile
cde/programs/dtinfo/dtinfo/src/Agents/LibraryAgentMotif.hh
cde/programs/dtinfo/dtinfo/src/Agents/NodePrintAgent.C
cde/programs/dtinfo/dtinfo/src/Agents/NodePrintAgent.hh
cde/programs/dtinfo/dtinfo/src/Agents/NodeWindowAgentMotif.C
cde/programs/dtinfo/dtinfo/src/Basic/FolioObject.C
cde/programs/dtinfo/dtinfo/src/Basic/FolioObject.hh
cde/programs/dtinfo/dtinfo/src/Basic/HashTbl.C
cde/programs/dtinfo/dtinfo/src/Basic/Imakefile
cde/programs/dtinfo/dtinfo/src/Graphics/Imakefile
cde/programs/dtinfo/dtinfo/src/Imakefile
cde/programs/dtinfo/dtinfo/src/Managers/Imakefile
cde/programs/dtinfo/dtinfo/src/Marks/Imakefile
cde/programs/dtinfo/dtinfo/src/OliasSearch/Imakefile
cde/programs/dtinfo/dtinfo/src/OnlineRender/Imakefile
cde/programs/dtinfo/dtinfo/src/Other/Imakefile
cde/programs/dtinfo/dtinfo/src/Other/WindowSystemMotif.C
cde/programs/dtinfo/dtinfo/src/Other/WindowSystemMotif.hh
cde/programs/dtinfo/dtinfo/src/Preferences/Imakefile
cde/programs/dtinfo/dtinfo/src/Preferences/UserPreference.C
cde/programs/dtinfo/dtinfo/src/Query/Imakefile
cde/programs/dtinfo/dtinfo/src/Support/Imakefile
cde/programs/dtinfo/dtinfo/src/Support/xList.hh
cde/programs/dtinfo/dtinfo/src/UAS/Base/Imakefile
cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_Exceptions.hh
cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_OQLParser.hh
cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Imakefile
cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Imakefile
cde/programs/dtinfo/dtinfo/src/Widgets/Imakefile
cde/programs/dtinfo/dtinfo/wwl/include/WWL/WArgList.h
cde/programs/dtinfo/dtinfo/wwl/include/WWL/WXmText.h
cde/programs/dtinfo/dtinfo/wwl/include/WWL/WXmTextField.h
cde/programs/dtinfo/dtinfo/wwl/include/WWL/wwl.h
cde/programs/dtinfo/dtinfogen/infolib/etc/ContentType.C
cde/programs/dtinfo/dtinfogen/infolib/etc/DataBase.h
cde/programs/dtinfo/dtinfogen/infolib/etc/Imakefile
cde/programs/dtinfo/dtinfogen/infolib/etc/RemoteId.C
cde/programs/dtinfo/dtinfogen/infolib/etc/ReplaceIdIdref.C
cde/programs/dtinfo/dtinfogen/infolib/etc/Task.h
cde/programs/dtinfo/dtinfogen/infolib/etc/Token.h
cde/programs/dtinfo/dtinfogen/infolib/etc/dtinfogen_worker.c
cde/programs/dtinfo/dtinfogen/infolib/etc/gr_type.C
cde/programs/dtinfo/dtinfogen/infolib/etc/lex.C
cde/programs/dtinfo/dtinfogen/install/Imakefile
cde/programs/dtinfo/dtinfogen/mmdb/StyleSheet/Imakefile
cde/programs/dtinfo/dtinfogen/mmdb/src/Imakefile
cde/programs/dtinfo/mmdb/HardCopy/Imakefile
cde/programs/dtinfo/mmdb/Imakefile
cde/programs/dtinfo/mmdb/StyleSheet/Imakefile
cde/programs/dtinfo/mmdb/api/Imakefile
cde/programs/dtinfo/mmdb/btree/Imakefile
cde/programs/dtinfo/mmdb/btree_berkeley/Imakefile
cde/programs/dtinfo/mmdb/compression/Imakefile
cde/programs/dtinfo/mmdb/diskhash/Imakefile
cde/programs/dtinfo/mmdb/dstr/Imakefile
cde/programs/dtinfo/mmdb/dti_cc/Imakefile
cde/programs/dtinfo/mmdb/dti_excs/Imakefile
cde/programs/dtinfo/mmdb/dynhash/Imakefile
cde/programs/dtinfo/mmdb/hmphf/Imakefile
cde/programs/dtinfo/mmdb/index/Imakefile
cde/programs/dtinfo/mmdb/mgrs/Imakefile
cde/programs/dtinfo/mmdb/object/Imakefile
cde/programs/dtinfo/mmdb/oliasdb/Imakefile
cde/programs/dtinfo/mmdb/schema/Imakefile
cde/programs/dtinfo/mmdb/storage/Imakefile
cde/programs/dtinfo/mmdb/utility/Imakefile
cde/programs/dtksh/Imakefile
cde/programs/dtksh/dtkcvt.c
cde/programs/dtksh/ksh93/Imakefile
cde/programs/dtksh/ksh93/src/cmd/ksh93/Mamfile
cde/programs/dtksh/ksh93/src/cmd/pax/Mamfile
cde/programs/dtksh/ksh93/src/lib/libast/Mamfile
cde/programs/dtksh/ksh93/src/lib/libast/feature/lib
cde/programs/dtksh/ksh93/src/lib/libast/features/lib
cde/programs/dtksh/ksh93/src/lib/libast/include/sfio.h
cde/programs/dtksh/ksh93/src/lib/libast/sfio/sfvprintf.c
cde/programs/dtksh/ksh93/src/lib/libcmd/Mamfile
cde/programs/dtksh/xmcmds.c
cde/programs/dtlogin/Imakefile
cde/programs/dtlogin/config/Xservers.src
cde/programs/dtlogin/dm.c
cde/programs/dtlogin/genauth.c
cde/programs/dtlogin/pam_svc.c
cde/programs/dtlogin/pam_svc.h
cde/programs/dtlogin/verify.c
cde/programs/dtmail/MotifApp/Imakefile
cde/programs/dtmail/MotifApp/InterruptibleCmd.C
cde/programs/dtmail/dtmail/Imakefile
cde/programs/dtmail/dtmailpr/Imakefile
cde/programs/dtmail/include/DtMail/DtMail.hh
cde/programs/dtmail/libDtMail/Common/Imakefile
cde/programs/dtmail/libDtMail/RFC/Imakefile
cde/programs/dtmail/libDtMail/RFC/RFCMailBox.C
cde/programs/dtpad/Imakefile
cde/programs/dtpdm/Imakefile
cde/programs/dtprintinfo/libUI/MotifUI/Imakefile
cde/programs/dtsearchpath/dtappg/Imakefile
cde/programs/dtsearchpath/dtappg/Options.C
cde/programs/dtsearchpath/dtappg/dtappgather.C
cde/programs/dtsearchpath/dtsp/Imakefile
cde/programs/dtsearchpath/dtsp/ManSearchPath.C
cde/programs/dtsearchpath/dtsp/Options.C
cde/programs/dtsearchpath/dtsp/SearchPath.C
cde/programs/dtsearchpath/dtsp/SearchPath.h
cde/programs/dtsearchpath/libCliSrv/Imakefile
cde/programs/dtsearchpath/libCliSrv/TTFile.C
cde/programs/dtsearchpath/libCliSrv/TTFile.h
cde/programs/dtsearchpath/libCliSrv/UnixEnv.C
cde/programs/dtsearchpath/libCliSrv/cstring.C
cde/programs/dtsearchpath/libCliSrv/cstring.h
cde/programs/dtsession/Imakefile
cde/programs/dtstyle/Imakefile
cde/programs/dtterm/Imakefile
cde/programs/dtudcfonted/libfal/Imakefile
cde/programs/dtwm/Imakefile
cde/programs/dtwm/WmFunction.c
cde/programs/dtwm/WmResCvt.c
cde/programs/dtwm/WmResource.c
cde/programs/fontaliases/sun/C/fonts.alias
cde/programs/localized/C/types/_common.dt.tmsg
cde/programs/localized/de_DE.ISO8859-1/types/_common.dt.tmsg
cde/programs/localized/es_ES.ISO8859-1/types/_common.dt.tmsg
cde/programs/localized/fr_FR.ISO8859-1/types/_common.dt.tmsg
cde/programs/nsgmls/CmdLineApp.C
cde/programs/nsgmls/CmdLineApp.h
cde/programs/nsgmls/CodingSystem.C
cde/programs/nsgmls/CodingSystem.h
cde/programs/nsgmls/EUCJPCodingSystem.C
cde/programs/nsgmls/Fixed2CodingSystem.C
cde/programs/nsgmls/IdentityCodingSystem.C
cde/programs/nsgmls/Imakefile
cde/programs/nsgmls/OutputCharStream.C
cde/programs/nsgmls/OutputCharStream.h
cde/programs/nsgmls/SJISCodingSystem.C
cde/programs/nsgmls/UTF8CodingSystem.C
cde/programs/nsgmls/UnicodeCodingSystem.C
cde/programs/nsgmls/config.h
cde/programs/nsgmls/nsgmls.C
cde/programs/nsgmls/xnew.h
cde/programs/ttsnoop/DtTt.C
cde/programs/ttsnoop/callbackChooser_stubs.C.src
cde/programs/ttsnoop/fileChooser_stubs.C.src
cde/programs/ttsnoop/messageProps_stubs.C.src
cde/programs/ttsnoop/patternProps_stubs.C.src
cde/programs/ttsnoop/sessionChooser_stubs.C.src
cde/programs/ttsnoop/stringChooser_stubs.C.src
cde/programs/ttsnoop/ttChooser_stubs.C.src
cde/programs/ttsnoop/tt_c++.h
cde/programs/ttsnoop/ttsnoop.C.src
cde/programs/ttsnoop/ttsnoop_stubs.C.src
cde/programs/types/dtwm.fp.src

index 6b812a3fdea77cd81c63c8dda8234bfdd94e5735..cf74e60b795620597d3bab153ea5d56099c2e5eb 100644 (file)
@@ -76,6 +76,19 @@ admin/IntegTools/post_install/netbsd/configRun
 admin/IntegTools/post_install/netbsd/configShlibs
 admin/IntegTools/post_install/netbsd/configTT
 
+admin/IntegTools/post_install/sun/CDE-MIN.list
+admin/IntegTools/post_install/sun/CDE-MIN.lst
+admin/IntegTools/post_install/sun/CDE-RUN.list
+admin/IntegTools/post_install/sun/CDE-RUN.lst
+admin/IntegTools/post_install/sun/CDE-SHLIBS.list
+admin/IntegTools/post_install/sun/CDE-SHLIBS.lst
+admin/IntegTools/post_install/sun/CDE-TT.list
+admin/IntegTools/post_install/sun/CDE-TT.lst
+admin/IntegTools/post_install/sun/configMin
+admin/IntegTools/post_install/sun/configRun
+admin/IntegTools/post_install/sun/configShlibs
+admin/IntegTools/post_install/sun/configTT
+
 admin/IntegTools/post_install/configDemos
 admin/IntegTools/post_install/configFonts
 admin/IntegTools/post_install/configHelp
@@ -90,6 +103,12 @@ admin/IntegTools/post_install/configPrg
 admin/IntegTools/post_install/configShlibs
 
 install.dt
+install.dt.dec
+install.dt.hp
+install.dt.ibm
+install.dt.sun
+install.dt.usl
+install.dt.uxp
 dinstall.dt
 dinstallCDE
 installCDE
@@ -367,9 +386,25 @@ doc/C/man/man3/
 doc/C/man/man4/
 doc/C/man/man5/
 doc/C/man/man6/
+doc/de_DE.ISO8859-1/cde.dti/
+doc/de_DE.ISO8859-1/guides/infoUGd/TOC.sgm
+doc/de_DE.ISO8859-1/guides/sysAdminGuide/TOC.sgm
+doc/de_DE.ISO8859-1/guides/usersGuide/TOC.sgm
 doc/de_DE.ISO8859-1/help-sdl/
+doc/es_ES.ISO8859-1/cde.dti/
+doc/es_ES.ISO8859-1/guides/infoUGd/TOC.sgm
+doc/es_ES.ISO8859-1/guides/sysAdminGuide/TOC.sgm
+doc/es_ES.ISO8859-1/guides/usersGuide/TOC.sgm
 doc/es_ES.ISO8859-1/help-sdl/
+doc/fr_FR.ISO8859-1/cde.dti/
+doc/fr_FR.ISO8859-1/guides/infoUGd/TOC.sgm
+doc/fr_FR.ISO8859-1/guides/sysAdminGuide/TOC.sgm
+doc/fr_FR.ISO8859-1/guides/usersGuide/TOC.sgm
 doc/fr_FR.ISO8859-1/help-sdl/
+doc/it_IT.ISO8859-1/cde.dti/
+doc/it_IT.ISO8859-1/guides/infoUGd/TOC.sgm
+doc/it_IT.ISO8859-1/guides/sysAdminGuide/TOC.sgm
+doc/it_IT.ISO8859-1/guides/usersGuide/TOC.sgm
 doc/it_IT.ISO8859-1/help-sdl/
 doc/ja_JP.dt-eucJP/m-guides/
 doc/tmp/
@@ -1094,6 +1129,7 @@ programs/dtksh/ksh93/src/lib/libvdelta/MAM.list
 programs/dtksh/ksh93/src/lib/libvdelta/MAM.time
 
 # programs/dtlogin
+programs/dtlogin/config/0015.sun.env
 programs/dtlogin/config/0060.dtsysenv
 programs/dtlogin/config/Dtlogin
 programs/dtlogin/config/Xaccess
@@ -1110,6 +1146,8 @@ programs/dtlogin/config/Xservers.con
 programs/dtlogin/config/Xservers.nc
 programs/dtlogin/config/Xsession
 programs/dtlogin/config/Xsession.ive
+programs/dtlogin/config/Xsession.ow
+programs/dtlogin/config/Xsession.ow2
 programs/dtlogin/config/Xsetup
 programs/dtlogin/config/Xstartup
 programs/dtlogin/config/current.session
@@ -1182,6 +1220,16 @@ programs/fontaliases/netbsd/C/dtinfo.pcf
 programs/fontaliases/netbsd/C/dtinfo.pcf.gz
 programs/fontaliases/netbsd/C/dtinfo.pcf.Z
 programs/fontaliases/netbsd/C/fonts.dir
+programs/fontaliases/sun/C/dtinfo.bdf
+programs/fontaliases/sun/C/dtinfo.pcf
+programs/fontaliases/sun/C/dtinfo.pcf.gz
+programs/fontaliases/sun/C/dtinfo.pcf.Z
+programs/fontaliases/sun/C/fonts.dir
+programs/fontaliases/sun/ja/dtinfo.bdf
+programs/fontaliases/sun/ja/dtinfo.pcf
+programs/fontaliases/sun/ja/dtinfo.pcf.gz
+programs/fontaliases/sun/ja/dtinfo.pcf.Z
+programs/fontaliases/sun/ja/fonts.dir
 
 # programs/ksh93
 programs/dtksh/ksh93/man/man1/sh.1
@@ -1235,6 +1283,8 @@ programs/localized/C/backdrops/Backdrops.nls
 programs/localized/C/backdrops/desc.C
 programs/localized/C/config/Xresources
 programs/localized/C/config/Xresources.nls
+programs/localized/C/config/Xresources.ow
+programs/localized/C/config/Xresources.ow.nls
 programs/localized/C/config/current.session
 programs/localized/C/config/current.session.nls
 programs/localized/C/config/current.session.tmsg
@@ -1401,6 +1451,8 @@ programs/localized/de_DE.ISO8859-1/backdrops/Backdrops.nls
 programs/localized/de_DE.ISO8859-1/backdrops/desc.de_DE.ISO8859-1
 programs/localized/de_DE.ISO8859-1/config/Xresources
 programs/localized/de_DE.ISO8859-1/config/Xresources.nls
+programs/localized/de_DE.ISO8859-1/config/Xresources.ow
+programs/localized/de_DE.ISO8859-1/config/Xresources.ow.nls
 programs/localized/de_DE.ISO8859-1/config/current.session
 programs/localized/de_DE.ISO8859-1/config/current.session.nls
 programs/localized/de_DE.ISO8859-1/config/current.session.tmsg
@@ -1590,6 +1642,8 @@ programs/localized/es_ES.ISO8859-1/backdrops/Backdrops.nls
 programs/localized/es_ES.ISO8859-1/backdrops/desc.es_ES.ISO8859-1
 programs/localized/es_ES.ISO8859-1/config/Xresources
 programs/localized/es_ES.ISO8859-1/config/Xresources.nls
+programs/localized/es_ES.ISO8859-1/config/Xresources.ow
+programs/localized/es_ES.ISO8859-1/config/Xresources.ow.nls
 programs/localized/es_ES.ISO8859-1/config/current.session
 programs/localized/es_ES.ISO8859-1/config/current.session.nls
 programs/localized/es_ES.ISO8859-1/config/current.session.tmsg
@@ -1779,6 +1833,8 @@ programs/localized/fr_FR.ISO8859-1/backdrops/Backdrops.nls
 programs/localized/fr_FR.ISO8859-1/backdrops/desc.fr_FR.ISO8859-1
 programs/localized/fr_FR.ISO8859-1/config/Xresources
 programs/localized/fr_FR.ISO8859-1/config/Xresources.nls
+programs/localized/fr_FR.ISO8859-1/config/Xresources.ow
+programs/localized/fr_FR.ISO8859-1/config/Xresources.ow.nls
 programs/localized/fr_FR.ISO8859-1/config/current.session
 programs/localized/fr_FR.ISO8859-1/config/current.session.nls
 programs/localized/fr_FR.ISO8859-1/config/current.session.tmsg
@@ -1968,6 +2024,8 @@ programs/localized/it_IT.ISO8859-1/backdrops/Backdrops.nls
 programs/localized/it_IT.ISO8859-1/backdrops/desc.it_IT.ISO8859-1
 programs/localized/it_IT.ISO8859-1/config/Xresources
 programs/localized/it_IT.ISO8859-1/config/Xresources.nls
+programs/localized/it_IT.ISO8859-1/config/Xresources.ow
+programs/localized/it_IT.ISO8859-1/config/Xresources.ow.nls
 programs/localized/it_IT.ISO8859-1/config/current.session
 programs/localized/it_IT.ISO8859-1/config/current.session.nls
 programs/localized/it_IT.ISO8859-1/config/current.session.tmsg
index c8e79cefed9b8f64e4a6f8d933189c39faced23a..5a62a342481f13ffe31f505294ccd0d18f414415 100755 (executable)
@@ -257,9 +257,13 @@ RestartInetd()
 
   OLDPWD=`pwd`
   cd /
-  if [ "$PLATFORM" = "sun" -o "$PLATFORM" = "usl" -o "$PLATFORM" = "uxp" ]
+  if [ "$PLATFORM" = "usl" -o "$PLATFORM" = "uxp" ]
   then
     /usr/sbin/inetd -s
+  elif [ "$PLATFORM" = "sun" ]
+  then
+    /usr/sbin/svcadm refresh svc:/network/inetd:default
+    /usr/sbin/svcadm restart svc:/network/inetd:default
   elif [ "$PLATFORM" = "aix" ]
   then
     startsrc -s inetd >>$LOGFILE 2>&1
@@ -601,7 +605,7 @@ XCOMM
   if [ "$PLATFORM" = "aix" ];
   then
     USER=`/bin/whoami`
-  elif [ "$PLATFORM" = "sun" -o "$PLATFORM" = "usl" -o "$PLATFORM" = "uxp" ];
+  elif [ "$PLATFORM" = "usl" -o "$PLATFORM" = "uxp" ];
   then
     USER=`/usr/ucb/whoami`
   else
index f83d34e75e272b46f515b6d76dd022e72df8e5b0..e0e9a3234c37fc89ece48685eff8e9be29c6726a 100755 (executable)
@@ -108,7 +108,7 @@ fi
 if [ $PLATFORM = "aix" ];
 then
         USER=`/bin/whoami`
-elif [ $PLATFORM = "sun" -o $PLATFORM = "usl" -o $PLATFORM = "uxp" ];
+elif [ $PLATFORM = "usl" -o $PLATFORM = "uxp" ];
 then
         USER=`/usr/ucb/whoami`
 else
index e21a34ba2abdc28e2d8d401d82e472709516e563..41bb9d0e41674e4874dbef83824e655a1c6b246f 100755 (executable)
@@ -227,8 +227,6 @@ XCOMM ###############################################################
 
     FixEtcInetdDotConf
 
-    FixEtcPamDotConf
-
     HASH
     HASH  create the /var/dt/tmp directory for the dtspcd
     HASH
@@ -245,8 +243,6 @@ XCOMM ###############################################################
 
     UnfixEtcInetdDotConf
 
-    UnfixEtcPamDotConf
-
     RemoveMinFiles
 
     VerifyInstalledFiles
index 8089b5e2c6b475de6ec44001999f0622cd045f29..c6b437d458576af1b10964e6653f97a6ea8b0f61 100755 (executable)
@@ -270,7 +270,7 @@ DEFAULT_PRINTER="DtPrint"
     HASH
     HASH ConfigurePrintersDir
     HASH
-    env LANG=C /usr/dt/bin/dtprintinfo -populate
+    env LANG=C /usr/dt/bin/dtprintinfo -populate 2>/dev/null
 
     HASH
     HASH Configure Xsession.d
index e6a120e6f070341b8778082ba7e5ed87e54a94ab..316a671000435800afa1df2a4aadcf36fcf0ab45 100644 (file)
@@ -36,7 +36,7 @@ XCOMM $TOG: DtInfo.rules /main/21 1997/09/05 11:31:01 samborn $
  * library building stuff
  */
 
-#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
+#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 5
 # define makelibT(libname)                                     @@\
        makelib(libname)                                        @@\
                                                                @@\
@@ -61,7 +61,7 @@ Concat3(subdir/libname/lib,libname,T.a): FRC                  @@\
            echo STR(*** Making lib libname Templates ***) ; \  @@\
            $(MAKE) Concat3(libname/lib,libname,T.a) ; \        @@\
        )
-#else /* not defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3 */
+#else /* not defined(SunArchitecture) && CplusplusCompilerMajorVersion > 5 */
 # define makelibT(libname)                                     @@\
        makelib(libname)
 #endif
@@ -153,7 +153,7 @@ Concat(lib,libname.a): objlist                                      @@\
        $(LD) -r -o $@ objlist
 
 
-#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
+#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 5
 #define SimpleLibraryT(libname,objlist,libdir)                 @@\
 SimpleLibrary(libname,objlist,libdir)                          @@\
                                                                @@\
@@ -198,7 +198,7 @@ Concat(lib,libname.a): objlist otherdeps                    @@\
        @echo STR(*** Making NotSoSimpleLibrary libname.a)      @@\
        $(LD) -r -o $@ objlist
 
-#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
+#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 5
 #define NotSoSimpleLibraryT(libname,objlist,libdir,otherdeps)  @@\
 NotSoSimpleLibrary(libname,objlist,libdir,otherdeps)           @@\
                                                                @@\
index 94de516df0ddaa7269d4e5f009c14491c4487d30..ee04e4d71ac8eaea6096247ceeaef2b4466e92d7 100644 (file)
@@ -590,6 +590,8 @@ LINTXMWIDGETLIB = $(MWIDGETSRC)/llib-l/Xm.ln
 /* check for existence of Dtinfo Motif Documents */
 #if defined(LinuxArchitecture)
       MOTIF_DOC = $(shell if test -f $(MDOCSRC)/C/guides/bookcase.bc; then echo -D_MOTIFDOC_; fi)
+#elif defined(SunArchitecture)
+  MOTIF_DOC :sh = if test -f ../imports/motif/doc/C/guides/bookcase.bc; then echo -D_MOTIFDOC_; else echo; fi
 #elif defined(BSDArchitecture)
      MOTIF_DOC != if test -f $(MDOCSRC)/C/guides/bookcase.bc; then echo -D_MOTIFDOC_; else echo; fi
 #else
index e405314565bccb2122ad8454f66de66599c18b04..8b79b228adc57f4255870d33f6e3ee8d232c7bd0 100644 (file)
@@ -232,12 +232,9 @@ XCOMM $XConsortium: cde.tmpl /main/2 1996/12/04 10:13:09 swick $
 #endif
 
 #ifndef UseNSGMLS
-# ifdef SunArchitecture
-#  define UseNSGMLS NO
-# else
-#  define UseNSGMLS YES
-# endif
+# define UseNSGMLS YES
 #endif
+
 #ifndef SGMLParser
 # if UseNSGMLS
 #  define SGMLDir $(NSGMLSSRC)
index 135304a3b732dc584d3c88568da909a73cb8ad8c..cec5905c204fcbb47e5c8a8cd48cf65f723f4c3a 100644 (file)
@@ -56,7 +56,22 @@ XCOMM site:  $TOG: site.def /main/23 1998/03/19 18:43:26 mgreess $
 # endif
 
 # if defined(SunArchitecture)
-#  define HasSunCplusplus      YES
+#  ifndef HasSunC
+#   define HasSunC             NO
+#  endif
+#  ifndef HasSunCplusplus
+#   define HasSunCplusplus     HasSunC
+#  endif
+#  ifndef HasGcc2
+#   if HasSunC
+#    define HasGcc2            NO
+#   else
+#    define HasGcc2            YES
+#   endif
+#  endif
+#  ifndef HasGcc2ForCplusplus
+#   define HasGcc2ForCplusplus HasGcc2
+#  endif
 # endif
 
 # if defined(UXPArchitecture) || defined(USLArchitecture) \
@@ -91,6 +106,8 @@ XCOMM site:  $TOG: site.def /main/23 1998/03/19 18:43:26 mgreess $
 #  define MotifProjectRoot     /usr/local
 # elif defined(NetBSDArchitecture)
 #  define MotifProjectRoot     /usr/pkg
+# elif defined(SunArchitecture)
+#  define MotifProjectRoot     /usr/X11
 # endif
 #endif
 
index d47d097d6ddc30620fc2c506d8d859a8fe706c26..9b646a8adb91d263647cd8a1ec304fb6e7d94a58 100644 (file)
@@ -16,42 +16,40 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 
 /*
  * Compiler setup.  This sun.cf file knows what options to use with 
- * certain compilers, including Sun C, CenterLine C, and gcc.  It 
- * also understands how to set some of the options for various C++
- * compilers, including Sun C++ and CenterLine C++.
+ * certain compilers, including Sun C and gcc.  It also understands
+ * how to set some of the options for various C++ compilers, including
+ * Sun C++ and g++.
  *
  * === C Compiler Setup ==========================================
  *
- * For SunPro C, define HasSunC to YES in site.def.  
- * For CenterLine C, define HasCenterLineC to YES in site.def
- * For gcc or gcc2, define HasGcc or HasGcc2 to YES in site.def
- * For other compilers, define HasSunC to NO in site.def, then 
+ * For SunPro C, define HasSunC to YES in host.def.
+ * For Gnu gcc, define HasGcc2 to YES in host.def
+ * For other compilers, define HasSunC to NO in host.def, then
  *    provide appropriate values for the various compiler related
  *    configuration varibles used here.
  * 
  * If you don't tell us which C compiler you have, we assume you have 
- * the SunPro C compiler under Solaris 2.x, and the bundled /bin/cc 
+ * the Gcc C compiler under Solaris 5.x.
  * under SunOS 4.1.x
  *
  * === C++ Compiler Setup ==========================================
  *
- * For SunPro C++, define HasSunCplusplus to YES in site.def
- * For CenterLine C++, define HasCenterLineCplusplus to YES in site.def
- * For Gnu g++ 2.6.x, define HasGcc2ForCplusplus to YES in site.def
- * For other compilers, define HasCplusplus to YES in site.def, and 
+ * For SunPro C++, define HasSunCplusplus to YES in host.def
+ * For Gnu g++ 4.x, define HasGcc2ForCplusplus to YES in host.def
+ * For other compilers, define HasCplusplus to YES in host.def, and
  *    check to see if you need to provide values for CplusplusOptions
  *    and/or DefaultCplusplusOptions.
  *
  * In any case, you may also need to set CplusplusDependIncludes.
  *
  * If you say you have the SunPro C++ compiler, we assume you have 
- * version 3.0.x of the compiler.  If you have version 4.0.x instead, 
- * define CplusplusCompilerMajorVersion as 4 in site.def.
+ * version 5.0.x of the compiler.  If you have version 4.0.x instead,
+ * define CplusplusCompilerMajorVersion as 4 in host.def.
  *
  */
 
 #ifndef HasSunC
-# if (HasCenterLineC || HasGcc || HasGcc2 || OSMajorVersion < 5)
+# if (HasGcc || HasGcc2 || OSMajorVersion < 5)
 #  define HasSunC NO
 # else
 #  define HasSunC YES
@@ -89,22 +87,44 @@ XCOMM SunPro C CCompilerMajorVersion./**/CCompilerMinorVersion
 XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
 #endif
 
-#if HasCenterLineC
-# ifndef CcCmd
-#  define CcCmd clcc
+#if HasGcc2
+# ifndef CCompilerMajorVersion
+#  define CCompilerMajorVersion DefaultGnuCCompilerMajorVersion
+# endif
+# ifndef CCompilerMinorVersion
+#  define CCompilerMinorVersion DefaultGnuCCompilerMinorVersion
 # endif
+XCOMM Gnu C CCompilerMajorVersion./**/CCompilerMinorVersion
 #endif
 
-#if HasCenterLineCplusplus
+#if HasGcc2ForCplusplus
 # ifndef HasCplusplus
 #  define HasCplusplus YES
 # endif
-# ifndef DefaultCplusplusOptions
-#  define DefaultCplusplusOptions -Xa
+# ifndef CplusplusCompilerMajorVersion
+#  ifdef DefaultGnuCplusplusCompilerMajorVersion
+#   define CplusplusCompilerMajorVersion DefaultGnuCplusplusCompilerMajorVersion
+#  else
+#   define CplusplusCompilerMajorVersion 4
+#  endif
 # endif
-# ifndef CplusplusOptions
-#  define CplusplusOptions -Xa
+# ifndef CplusplusCompilerMinorVersion
+#  ifdef DefaultGnuCplusplusCompilerMinorVersion
+#   define CplusplusCompilerMinorVersion DefaultGnuCplusplusCompilerMinorVersion
+#  else
+#   define CplusplusCompilerMinorVersion 6
+#  endif
 # endif
+XCOMM Gnu C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
+#endif
+
+
+#if OSMajorVersion > 4
+#define MkdirHierCmd           mkdir -p
+#endif
+
+#ifndef OptimizedCDebugFlags
+# define OptimizedCDebugFlags  -O2
 #endif
 
 #if OSMajorVersion < 4 || (OSMajorVersion == 4 && OSMinorVersion < 1)
@@ -144,20 +164,23 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
 #define ConnectionFlags                -DTCPCONN -DUNIXCONN -DLOCALCONN
 #if HasSunC
 /* 
- * Assume /opt/SUNWspro/bin/ contains symlinks to the appropriate tools
+ * Assume /opt/solarisstudio/bin/ contains symlinks to the appropriate tools
  */
 #ifndef  CcCmd
-# define CcCmd                 /opt/SUNWspro/bin/cc
+# define CcCmd                 /opt/solarisstudio/bin/cc
 #endif
 #ifndef  CplusplusCmd
-# define CplusplusCmd          /opt/SUNWspro/bin/CC
+# define CplusplusCmd          /opt/solarisstudio/bin/CC
 #endif
 #ifndef  CplusplusFilt
-#  define CplusplusFilt        /opt/SUNWspro/bin/c++filt
+#  define CplusplusFilt        /opt/solarisstudio/bin/c++filt
+#endif
+#ifndef CplusplusLibC
+#define CplusplusLibC          -L/opt/solarisstudio/lib -lCrun
 #endif
 #ifndef  CplusplusDependIncludes
 #if CplusplusCompilerMajorVersion > 3
-# define CplusplusDependIncludes       -I/opt/SUNWspro/SC4.0/include/CC
+# define CplusplusDependIncludes       -I/opt/solarisstudio/prod/include/CC -I/opt/solarisstudio/prod/include/CC/Cstd
 #elif CplusplusCompilerMajorVersion > 2
 # define CplusplusDependIncludes       -I/opt/SUNWspro/SC3.0/include/CC
 #else
@@ -165,7 +188,6 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
 #endif
 #endif
 #endif
-
 # if HasSunC && (CCompilerMajorVersion < 3)
 #  define BootstrapCFlags      -DSVR4
 # else
@@ -208,7 +230,7 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
 #  endif
 # endif                /* OSMinorVersion > 1 */
 # ifndef UseExportLists
-#  define UseExportLists YES
+#  define UseExportLists   NO
 # endif
 # define HasVFork          NO
 # define InstKmemFlags   -g sys -m 2711
@@ -217,11 +239,11 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
  * Set flags for position independent code before including sv4Lib.rules
  * if the compiler in use doesn't use standard SVR4 flags
  */
-# if HasSunC || HasCenterLineC
+# if HasSunC
 #  define PositionIndependentCFlags -Kpic
 #  define LargePositionIndependentCFlags -KPIC
 # endif
-# if HasSunCplusplus || HasCenterLineCplusplus
+# if HasSunCplusplus
 #  define PositionIndependentCplusplusFlags -pic
 #  define LargePositionIndependentCplusplusFlags -PIC
 # endif
@@ -255,12 +277,10 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
 #  endif
 # endif
 # if HasGcc2
-#  ifndef OptimizedCDebugFlags
-#   ifdef i386Architecture
-#    define OptimizedCDebugFlags -m486 DefaultGcc2i386Opt
-#   else
-#    define OptimizedCDebugFlags -O2
-#   endif
+#  define SharedLibraryLoadFlags -shared
+#  define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
+#  ifdef i386Architecture
+#   define CcCmd               gcc
 #  endif
 # else
 #  define SharedLibraryCcCmd cc
@@ -296,27 +316,23 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
 #  endif       
 # endif
 
-/* Set compiler-dependent options for CenterLine C */
+# define PexCCOptions DefaultCCOptions
 
-# if HasCenterLineC
-#  ifndef DefaultCCOptions
-#   define DefaultCCOptions -Xt -w1 -DANSICPP -U__HIGHC__
-#  endif
-#  ifndef NeedConstPrototypes
-#   define NeedConstPrototypes YES
-#  endif
-#  ifndef NeedNestedPrototypes
-#   define NeedNestedPrototypes YES
-#  endif
-#  ifndef NeedVarargsPrototypes
-#   define NeedVarargsPrototypes YES
-#  endif
-# endif
+#endif /* HasGcc || HasGcc2 (else) */
 
+#if HasGcc2
+CXXDEPENDINCLUDE :sh = CcCmd -v -x c++ /dev/null -fsyntax-only \
+                      2>&1 | sed -n 's/^ \(\/.*[cg]++.*\)/-I\1/p'
+#define CplusplusDependIncludes        $(CXXDEPENDINCLUDE)
+#endif
 
-# define PexCCOptions DefaultCCOptions
+#if HasGcc2ForCplusplus
+#define CplusplusCmd   g++
+#ifndef CplusplusLibC
+#define CplusplusLibC  -L/usr/gnu/lib -lstdc++
+#endif
+#endif /* HasGcc2ForCplusplus */
 
-#endif /* HasGcc || HasGcc2 (else) */
 
 #if OSMajorVersion < 5
 # define SharedAllocateLocalDefines -DINCLUDE_ALLOCA_H
@@ -346,8 +362,12 @@ man_keywords::                                                             @@\
 #define SharedXdmcpRev 6
 #endif
 
-#define MotifDefines                   \
-       -DNO_ISDIR -DNO_REGCOMP -DNO_ALLOCA -DBOGUS_MB_MAX -DNO_CONST
+#define DependFileName         .depend
+#if HasSunC
+#define DependDefines          -D__BUILTIN_VA_ARG_INCR
+#endif
+
+#define LdPreLib               -L/usr/X11/lib -L$(BUILDLIBDIR)
 #define PamUnixDefines         -DPAM_NIS
 #define TtLargePICTable                YES
 #define DtSvcDefines           -DMULTIBYTE -DNO_REGCOMP
@@ -355,6 +375,11 @@ man_keywords::                                                             @@\
 #define DtWidgetDefines                DtSearchDefines
 #define DtPrintDefines         DtSearchDefines
 
+/* For DtHelp TIFF processing routines. */
+#if defined(AMD64Architecture) || defined(i386Architecture)
+#define LSBBitOrder             YES
+#endif
+
 #define baseDtMailDefines      \
        -DSunOS=OSMajorVersion\#\#OSMinorVersion -DMMAP_NORESERVE -DSPRO_V2
 #ifndef i386Architecture
@@ -367,10 +392,15 @@ man_keywords::                                                            @@\
 
 #define TtClientExtraLibs      ExtraLibraries -ldl -lintl
 
-#define ExportListGenSource    elistgen.sun
+#ifndef TopMotifInclude
+# define TopMotifInclude       /usr/X11/include
+#endif
+
 #define ShlibExportListOpt(filename)   -M filename
 
+#define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB)
+#define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
+
 #define CdeProjectDefines \
-       -DMULTIBYTE -DNLS16 -DMESSAGE_CAT -D_XOPEN_VERSION=4 \
-       -D_XOPEN_SOURCE -D__EXTENSIONS__ \
+       -DMULTIBYTE -DNLS16 -DMESSAGE_CAT -D__EXTENSIONS__ \
        -DOSMAJORVERSION=OSMajorVersion -DOSMINORVERSION=OSMinorVersion
index 0e8c8c2f68e23160bbfb638ff0272ffcdef8618a..e0f9cd7dac17dda38186ecb76b868159e44f5f5e 100644 (file)
@@ -55,15 +55,15 @@ XCOMM $TOG: sunLib.tmpl /main/47 1997/12/12 14:53:33 kaleb $
 # define SharedPamDialAuthReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) SharedThreadReqs
 # define SharedPamRhostsAuthReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) -lsocket SharedThreadReqs
 # define SharedPamDceAuthReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) -ldce -lnsl -lsocket SharedThreadReqs
-# define SharedTtReqs -lnsl -lsocket -lintl -ldl -lc -lw
-# define SharedDtSvcReqs $(LDPRELIBS) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) SharedThreadReqs -lgen -lc -lsocket -lnsl -ldl
+# define SharedTtReqs $(XTOOLLIB) -lnsl -lsocket -lintl -ldl -lc -lw $(CXXLIB)
+# define SharedDtSvcReqs $(LDPRELIBS) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) SharedThreadReqs -lgen -lc -lsocket -lnsl -ldl $(CXXLIB)
 # define SharedDtMmdbReqs $(LDPRELIBS) $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) SharedThreadReqs -lgen -lc -lsocket -lnsl -ldl
 # define SharedDtSearchReqs -lm -lc
 # define SharedDtWidgetReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) -lintl $(LDPOSTLIBS) -lw -lm -lc
-# define SharedDtHelpReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) -lw -lgen -lm -lc
+# define SharedDtHelpReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) -lw -lgen -lm -lc -ljpeg
 # define SharedDtPrintReqs $(LDPRELIBS) $(DTSVCLIB) $(DTHELPLIB) $(XMLIB) -lintl $(LDPOSTLIBS) -lw -lm -lc
 # define SharedDtTermReqs SharedDtHelpReqs -ldl -lgen
-# define SharedDtMrmReqs $(LDPRELIBS) $(DTTERMLIB) $(DTPRINTLIB) $(DTHELPLIB) $(DTWIDGETLIB) $(MRESOURCELIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) -lw -lsocket -lnsl -lc
+# define SharedDtMrmReqs $(LDPRELIBS) $(DTTERMLIB) $(DTPRINTLIB) $(DTHELPLIB) $(DTWIDGETLIB) $(MRESOURCELIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) -lw -lsocket -lnsl -lc $(CXXLIB)
 # define SharedDtMailReqs $(LDPRELIBS) -lw $(CXXLIB) -lm -ldl
 # define SharedCsaReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) SharedXmReqs
 
@@ -74,10 +74,10 @@ ICONV_INBUF_DEFINE = -DICONV_INBUF_CONST=const
 
 # if HasCplusplus
 #  if HasGcc2ForCplusplus
-UNSHARED_CXXLIB = -static -lC
+UNSHARED_CXXLIB =
 #  elif HasSunCplusplus
 #   if CplusplusCompilerMajorVersion > 3
-UNSHARED_CXXLIB = -lC
+UNSHARED_CXXLIB =
 #   else
 UNSHARED_CXXLIB = -Bstatic -lC -Bdynamic -lm -lc -Bstatic
 #   endif
index 0e4e1d6d6c34349f95365d245d27f1b152221bdb..779db75eb5651eab4a68d5febeabee8afb27f030 100644 (file)
@@ -61,8 +61,17 @@ install:: Concat(lib,libname.so.rev)                                         @@\
 #endif /* InstallSharedLibraryData */
 
 #ifndef LinkWithExports
-# if UseExportLists
-#  define LinkWithExports(libname,rev,solist,down,up) \
+# if defined(SunArchitecture)
+#  if HasGcc2
+#   define LinkWithExports(libname,rev,solist,down,up) \
+       (cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$@ solist $(REQUIREDLIBS))
+#  else
+#   define LinkWithExports(libname,rev,solist,down,up) \
+       (cd down; $(CCENVSETUP) $(CXX) -o up/$@~ $(SHLIBLDFLAGS) -h $@ solist $(REQUIREDLIBS))
+#  endif
+# else
+#  if UseExportLists
+#   define LinkWithExports(libname,rev,solist,down,up) \
        (cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) -h $@ solist $(REQUIREDLIBS))   @@\
        if [ -f Concat(lib,libname.elist) ]; then \                     @@\
            $(RM) down/$@.exports $@.list; \                            @@\
@@ -71,9 +80,10 @@ install:: Concat(lib,libname.so.rev)                                         @@\
            (cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) -h $@ ShlibExportListOpt($@.exports) solist $(REQUIREDLIBS)); \     @@\
            $(RM) down/$@.exports $@.list; \                            @@\
        fi;
-# else
-#  define LinkWithExports(libname,rev,solist,down,up) \
+#  else
+#   define LinkWithExports(libname,rev,solist,down,up) \
        (cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) -h $@ solist $(REQUIREDLIBS))
+#  endif
 # endif
 #endif
 
index 9f15ddc58d4096759bd188d17e6cea209ef3ffef..8cbcfd0e2e6c2a4cb33a321a9577696e81a10908 100644 (file)
@@ -101,10 +101,10 @@ XCOMM $TOG: svr4.cf /main/17 1997/06/08 20:08:31 kaleb $
 #define DefaultCCOptions -Xa -Dasm=__asm
 #endif
 #endif
-#ifndef DefaultCDebugFlags
+#if !defined(DefaultCDebugFlags) && !defined(OptimizedCDebugFlags)
 #if HasGcc2
 #ifdef i386Architecture
-#define DefaultCDebugFlags -m486 DefaultGcc2i386Opt
+#define DefaultCDebugFlags -O2
 #else
 #define DefaultCDebugFlags -O2
 #endif
index 52548b459bb15c14e2ce6230486eea3c2d28018d..cd3d0d8a0c5da3b192391889f0929cc33e2cc239 100644 (file)
@@ -7,6 +7,7 @@ XCOMM not exist.  Since BUILDLIBDIR may not exist yet suppress its use.
 
 DEPLIBS = 
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 INCLUDES = -I$(TOP)/include $(TOP_X_INCLUDES)/X11
 CPP_PROGRAM = CppCmd
 CPP_DEFINES = -DCPP_PROGRAM="\"$(CPP_PROGRAM)\""
index 1bb833513a2cf7f656fde35eb5d62bf829232142..2d6649f6143e7d28e2bfdf9740e3822f7ea9ede1 100644 (file)
@@ -1096,8 +1096,12 @@ get_sun_compiler_versions(FILE *inFile)
 {
   char buf[PATH_MAX];
   char cmd[PATH_MAX];
-  static char* sunpro_cc = "/opt/SUNWspro/bin/cc";
-  static char* sunpro_CC = "/opt/SUNWspro/bin/CC";
+  static char* sunpro_cc = "/opt/solarisstudio/bin/cc";
+  static char* sunpro_CC = "/opt/solarisstudio/bin/CC";
+  static char* gnu_cc1 = "/usr/bin/gcc";
+  static char* gnu_cc2 = "/usr/gnu/bin/gcc";
+  static char* gnu_CC1 = "/usr/bin/g++";
+  static char* gnu_CC2 = "/usr/gnu/bin/g++";
   int cmajor, cminor;
   char* vptr;
   struct stat sb;
@@ -1142,6 +1146,56 @@ get_sun_compiler_versions(FILE *inFile)
       pclose (ccproc);
     }
   }
+  cmd[0] = '\0';
+  if (lstat (gnu_cc1, &sb) == 0) {
+    strncpy (cmd, gnu_cc1, PATH_MAX);
+  }
+  else if (lstat (gnu_cc2, &sb) == 0) {
+    strncpy (cmd, gnu_cc2, PATH_MAX);
+  }
+  if (cmd[0] != '\0') {
+    strncat (cmd, " --version 2>&1", 15);
+    if ((ccproc = popen (cmd, "r")) != NULL) {
+      if (fgets (buf, PATH_MAX, ccproc) != NULL) {
+       vptr = strrchr (buf, 'G');
+       for (; !isdigit(*vptr); vptr++);
+       ret = sscanf (vptr, "%d.%d", &cmajor, &cminor);
+       fprintf (inFile,
+                "#define DefaultGnuCCompilerMajorVersion %d\n",
+                cmajor);
+       fprintf (inFile,
+                "#define DefaultGnuCCompilerMinorVersion %d\n",
+                cminor);
+      }
+      while (fgets (buf, PATH_MAX, ccproc) != NULL) {};
+      pclose (ccproc);
+    }
+  }
+  cmd[0] = '\0';
+  if (lstat (gnu_CC1, &sb) == 0) {
+    strncpy (cmd, gnu_CC1, PATH_MAX);
+  }
+  else if (lstat (gnu_CC2, &sb) == 0) {
+    strncpy (cmd, gnu_CC2, PATH_MAX);
+  }
+  if (cmd[0] != '\0') {
+    strncat (cmd, " --version 2>&1", 15);
+    if ((ccproc = popen (cmd, "r")) != NULL) {
+      if (fgets (buf, PATH_MAX, ccproc) != NULL) {
+       vptr = strrchr (buf, 'G');
+       for (; !isdigit(*vptr); vptr++);
+       ret = sscanf (vptr, "%d.%d", &cmajor, &cminor);
+       fprintf (inFile,
+                "#define DefaultGnuCplusplusCompilerMajorVersion %d\n",
+                cmajor);
+       fprintf (inFile,
+                "#define DefaultGnuCplusplusCompilerMinorVersion %d\n",
+                cminor);
+      }
+      while (fgets (buf, PATH_MAX, ccproc) != NULL) {};
+      pclose (ccproc);
+    }
+  }
   (void) ret;
 }
 #endif
@@ -1152,6 +1206,10 @@ get_gcc_incdir(FILE *inFile)
   static char* gcc_path[] = {
 #ifdef linux
     "/usr/bin/cc",     /* for Linux PostIncDir */
+#endif
+#ifdef sun
+    "/usr/bin/gcc",
+    "/usr/gnu/bin/gcc",
 #endif
     "/usr/local/bin/gcc",
     "/opt/gnu/bin/gcc"
index 98d67fc46adfd39d5a368bc878fe2eb53e5f1372..6ebd615c551c4bba909cd23300863dc481c87b49 100644 (file)
@@ -1,4 +1,4 @@
-XCOMM $TOG: Imakefile /main/27 1997/04/30 15:38:09 kaleb $
+XCOMM $tog: Imakefile /main/27 1997/04/30 15:38:09 kaleb $
 
     SRCS = include.c main.c parse.c pr.c cppsetup.c ifparser.c 
     OBJS = include.o main.o parse.o pr.o cppsetup.o ifparser.o 
@@ -28,6 +28,7 @@ INC_DEFINES = $(PREINC_DEFINES) $(STDINC_DEFINES) $(POSTINC_DEFINES)
 OSUF = .Osuf
 OSUF_DEFINES = -DOBJSUFFIX=\"$(OSUF)\"
 MAIN_DEFINES = $(INC_DEFINES) $(SIGNAL_DEFINES) $(OSUF_DEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 INCLUDES = -I$(IMAKESRC) -I$(TOP)/include $(TOP_X_INCLUDES)/X11
 
  DEPLIBS =
index ec5ef8c42e886c60ed8ef5aa1cbe8519d7ba595b..17e71a8c5bd3b1eaeeec2d9f05da77c68668faa2 100644 (file)
@@ -81,7 +81,6 @@
 
 #include "ifparser.h"
 #include <ctype.h>
-#include <stdlib.h>
 #include <string.h>
 #include <limits.h>
 
index 81da4d569602e2a04ea2d84722d6ca67d7137cb9..8fe853b6aed6f3efbe46376d048f9e73d5a8ecb4 100644 (file)
@@ -77,6 +77,7 @@
  *     ParseIfExpression               parse a string for #if
  */
 
+#include <stdlib.h>
 #include <stdio.h>
 
 #define const /**/
index d76625b82c1b65a7ab57049b00a4e97bfc5665e6..b6f3748c450faa6493814c2a8ff1e76c32a5722c 100644 (file)
@@ -525,7 +525,8 @@ char *our_getline(filep)
        lineno = filep->f_line;
 
        for(bol = p--; ++p < eof; ) {
-               if (*p == '/' && *(p+1) == '*') { /* consume comments */
+               if (*p == '/' && (p+1) < eof && *(p+1) == '*') {
+                       /* consume C comments */
                        *p++ = ' ', *p++ = ' ';
                        while (*p) {
                                if (*p == '*' && *(p+1) == '/') {
@@ -538,15 +539,31 @@ char *our_getline(filep)
                        }
                        continue;
                }
-#ifdef WIN32
-               else if (*p == '/' && *(p+1) == '/') { /* consume comments */
-                       *p++ = ' ', *p++ = ' ';
-                       while (*p && *p != '\n')
-                               *p++ = ' ';
-                       lineno++;
-                       continue;
+               else if (*p == '/' && (p+1) < eof && *(p+1) == '/') {
+                       /* consume C++ comments */
+                       *p++ = ' ';
+                       *p++ = ' ';
+                       while (p < eof && *p) {
+                               if (*p == '\\' && (p+1) < eof &&
+                                   *(p+1) == '\n') {
+                                       *(p++) = ' ';
+                                       lineno++;
+                               }
+                               else if (*p == '?' && (p+3) < eof &&
+                                        *(p+1) == '?' &&
+                                        *(p+2) == '/' &&
+                                        *(p+3) == '\n') {
+                                       *(p++) = ' ';
+                                       *(p++) = ' ';
+                                       *(p++) = ' ';
+                                       lineno++;
+                               }
+                               else if (*p == '\n')
+                                       break;  /* to process end of line */
+                               *(p++) = ' ';
+                       }
+                       --p;
                }
-#endif
                else if (*p == '\\') {
                        if (*(p+1) == '\n') {
                                *p = ' ';
index 0c23618515e08170ddc198c6dddf1f48d94dc46b..72ef301c951176a83942e2eccc3538d61f493026 100644 (file)
@@ -60,6 +60,7 @@ add_include(filep, file, file_red, include, dot, failOK)
        struct inclist  *file, *file_red;
        char    *include;
        boolean dot;
+       boolean failOK;
 {
        register struct inclist *newfile;
        register struct filepointer     *content;
index 0ec596329c6e02493549242c91f4f86fddc5789b..a82e20fff6b9fa2700c96b13e878a3d18de1d606 100644 (file)
@@ -13,6 +13,8 @@ CMKDIRHIER = mkdirhier.exe
 
 PROGRAMS = xmkmf $(MDEP_PROG) mergelib ProgramTargetName(makestrs) $(EXPORTLISTGEN) $(CMKDIRHIER)
 DEPLIBS =
+DEPEND_DEFINES = $(DEPENDDEFINES)
+
 #ifndef Win32Architecture
   EXTRA_LIBRARIES =
 #endif
index f3618bcb569bb07896b2f18c20125b9180cf964c..bae88f19dccee93938d8335105215ca6cba599f9 100644 (file)
@@ -308,6 +308,7 @@ static void WriteHeader (tagline, phile, abi)
 static void WriteSourceLine (te, abi, fudge)
     TableEnt* te;
     int abi;
+    int fudge;
 {
     char* c;
 
index 05f43e6fdbc4429c77027dd877a9f6a57839c6f4..224977c92414bd5491e9833a6c8573e78446b877 100644 (file)
@@ -629,9 +629,9 @@ programs/fontaliases/sun/C/fonts.dir
        install_target = /usr/dt/config/xfonts/C/fonts.dir
 }
 #
-programs/fontaliases/sun/C/dtinfo.pcf
+programs/fontaliases/sun/C/dtinfo.pcf.Z
 { sun
-       install_target = /usr/dt/config/xfonts/C/dtinfo.pcf
+       install_target = /usr/dt/config/xfonts/C/dtinfo.pcf.Z
 }
 programs/fontaliases/sun/ja/fonts.alias
 #
@@ -644,9 +644,9 @@ programs/fontaliases/sun/ja/fonts.dir
        install_target = /usr/dt/config/xfonts/ja/fonts.dir
 }
 #
-programs/fontaliases/sun/ja/dtinfo.pcf
+programs/fontaliases/sun/ja/dtinfo.pcf.Z
 { sun
-       install_target = /usr/dt/config/xfonts/C/dtinfo.pcf
+       install_target = /usr/dt/config/xfonts/C/dtinfo.pcf.Z
 }
 #
 #programs/fontaliases/sun/ko/fonts.dir
index 9ce756948cce2a1f67b87b4df16be94e5fe9761c..45d41ba9e812df6315e668e6a8d36942b36da366 100644 (file)
@@ -409,79 +409,6 @@ programs/dtdocbook/doc2sdl/SGML/iso-tech.gml
        install_target = /usr/dt/dthelp/dtdocbook/SGML/iso-tech.gml
 }
 #
-#>>---------------------------
-# XXXXX - TEMPORARY symlinks to SGML files
-# SGML files: dtdocbook
-# These should go away once Sun can compile nsgmls
-#----------------------------- 
-#
-#
-./dtinfo.af
-{ sun
-       install_target = /usr/dt/dthelp/dtdocbook/SGML/-%%Common_Desktop_Environment%%ENTITIES_DtInfo_Architectural_Forms%%EN
-       type = sym_link
-}
-#
-./docbook.dtd
-{ sun
-       install_target = /usr/dt/dthelp/dtdocbook/SGML/-%%HaL_and_O'Reilly%%DTD_DocBook%%EN
-       type = sym_link
-}
-#
-./iso-lat1.gml
-{ sun
-       install_target = /usr/dt/dthelp/dtdocbook/SGML/ISO_8879-1986%%ENTITIES_Added_Latin_1%%EN
-       type = sym_link
-}
-#
-./iso-lat2.gml
-{ sun
-       install_target = /usr/dt/dthelp/dtdocbook/SGML/ISO_8879-1986%%ENTITIES_Added_Latin_2%%EN
-       type = sym_link
-}
-#
-./iso-box.gml
-{ sun
-       install_target = /usr/dt/dthelp/dtdocbook/SGML/ISO_8879-1986%%ENTITIES_Box_and_Line_Drawing%%EN
-       type = sym_link
-}
-#
-./iso-dia.gml
-{ sun
-       install_target = /usr/dt/dthelp/dtdocbook/SGML/ISO_8879-1986%%ENTITIES_Diacritical_Marks%%EN
-       type = sym_link
-}
-#
-./iso-tech.gml
-{ sun
-       install_target = /usr/dt/dthelp/dtdocbook/SGML/ISO_8879-1986%%ENTITIES_General_Technical%%EN
-       type = sym_link
-}
-#
-./iso-grk1.gml
-{ sun
-       install_target = /usr/dt/dthelp/dtdocbook/SGML/ISO_8879-1986%%ENTITIES_Greek_Letters%%EN
-       type = sym_link
-}
-#
-./iso-grk3.gml
-{ sun
-       install_target = /usr/dt/dthelp/dtdocbook/SGML/ISO_8879-1986%%ENTITIES_Greek_Symbols%%EN
-       type = sym_link
-}
-#
-./iso-num.gml
-{ sun
-       install_target = /usr/dt/dthelp/dtdocbook/SGML/ISO_8879-1986%%ENTITIES_Numeric_and_Special_Graphic%%EN
-       type = sym_link
-}
-#
-./iso-pub.gml
-{ sun
-       install_target = /usr/dt/dthelp/dtdocbook/SGML/ISO_8879-1986%%ENTITIES_Publishing%%EN
-       type = sym_link
-}
-#
 #>>-------------------------
 #  pixmaps and helptag files
 #---------------------------
index 79b5bb839ddf865d379389543aecd08b117b8de2..35ad442d9ddcc2ebb5037be5fe4e8a5bfc826dc9 100644 (file)
@@ -322,318 +322,6 @@ programs/dtinfo/dtinfogen/infolib/C/SGML/styprolog.sgml
 }
 #
 #>>----------------------------- 
-# XXXXX - TEMPORARY symlinks to SGML files
-# These should go away once Sun can compile nsgmls
-#<<----------------------------- 
-#
-#
-/usr/dt/infolib/C/SGML/dtinfoBook.dtd
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/-%%Common_Desktop_Environment%%DTD_DtInfo_Bookcase_Description%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/dtinfoStyle.dtd
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/-%%Common_Desktop_Environment%%DTD_DtInfo_Style_Sheet%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/dtinfoTOC.dtd
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/-%%Common_Desktop_Environment%%DTD_DtInfo_Table_of_Contents%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/dtinfo.af
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/-%%Common_Desktop_Environment%%ENTITIES_DtInfo_Architectural_Forms%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-catalog
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/-%%Common_Desktop_Environment%%ENTITIES_ISO_Catalog%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/proxy.ss
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/-%%Common_Desktop_Environment%%ENTITIES_Dtinfo_SS_Localization%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/docbook.dtd
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/-%%HaL_and_O'Reilly%%DTD_DocBook%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-lat1.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_Added_Latin_1%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-lat2.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_Added_Latin_2%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-amsa.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_Added_Math_Symbols\:_Arrow_Relations%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-amsb.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_Added_Math_Symbols\:_Binary_Operators%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-amsc.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_Added_Math_Symbols\:_Delimiters%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-amsn.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_Added_Math_Symbols\:_Negated_Relations%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-amso.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_Added_Math_Symbols\:_Ordinary%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-amsr.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_Added_Math_Symbols\:_Relations%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-grk4.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_Alternative_Greek_Symbols%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-box.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_Box_and_Line_Drawing%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-dia.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_Diacritical_Marks%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-tech.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_General_Technical%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-grk1.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_Greek_Letters%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-grk3.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_Greek_Symbols%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-grk2.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_Monotoniko_Greek%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-cyr2.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_Non-Russian_Cyrillic%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-num.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_Numeric_and_Special_Graphic%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-pub.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_Publishing%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-cyr1.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879\:1986%%ENTITIES_Russian_Cyrillic%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-mfrk.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_9573-13\:1991%%ENTITIES_Math_Alphabets\:_Fraktur_%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-mopf.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_9573-13\:1991%%ENTITIES_Math_Alphabets\:_Open_Face_%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-mscr.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_9573-13\:1991%%ENTITIES_Math_Alphabets\:_Script_%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-lat1.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_Added_Latin_1%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-lat2.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_Added_Latin_2%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-amsa.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_Added_Math_Symbols\:_Arrow_Relations%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-amsb.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_Added_Math_Symbols\:_Binary_Operators%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-amsc.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_Added_Math_Symbols\:_Delimiters%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-amsn.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_Added_Math_Symbols\:_Negated_Relations%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-amso.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_Added_Math_Symbols\:_Ordinary%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-amsr.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_Added_Math_Symbols\:_Relations%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-grk4.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_Alternative_Greek_Symbols%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-box.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_Box_and_Line_Drawing%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-dia.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_Diacritical_Marks%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-tech.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_General_Technical%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-grk1.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_Greek_Letters%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-grk3.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_Greek_Symbols%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-grk2.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_Monotoniko_Greek%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-cyr2.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_Non-Russian_Cyrillic%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-num.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_Numeric_and_Special_Graphic%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-pub.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_Publishing%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-cyr1.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_8879-1986%%ENTITIES_Russian_Cyrillic%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-mfrk.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_9573-13-1991%%ENTITIES_Math_Alphabets\:_Fraktur_%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-mopf.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_9573-13-1991%%ENTITIES_Math_Alphabets\:_Open_Face_%%EN
-       type = sym_link
-}
-#
-/usr/dt/infolib/C/SGML/iso-mscr.gml
-{ sun
-       install_target = /usr/dt/infolib/C/SGML/ISO_9573-13-1991%%ENTITIES_Math_Alphabets\:_Script_%%EN
-       type = sym_link
-}
-#
-#>>----------------------------- 
 # dtinfo spec files
 #<<----------------------------- 
 #
index 5786341ffa8fe8b0b4235acba4e3b55c1b524f2e..0d15c69e21f0ee3babb5b9dfe872a2806bc2c7de 100644 (file)
@@ -1071,6 +1071,12 @@ programs/backdrops/Sprinkles.pm
        install_target = /usr/dt/share/backdrops/Sprinkles.pm
 }
 #
+#
+programs/backdrops/SunLogo.pm
+{ sun
+       install_target = /usr/dt/share/backdrops/SunLogo.pm
+}
+#
 programs/backdrops/Toronto.bm
 { default
        install_target = /usr/dt/share/backdrops/Toronto.bm
@@ -1936,14 +1942,6 @@ programs/nsgmls/nsgmls
         mode = 0555
 }
 #
-# XXXXX - TEMPORARY until Sun can compile nsgmls
-#
-programs/dtdocbook/sgmls/sgmls
-{ sun
-        install_target = /usr/dt/infolib/etc/sgmls
-        mode = 0555
-}
-#
 #>>----------------------------- 
 # 
 # MMDB
index 6e06c2b56f7ced63f922319b3f6d2c8fd85704e6..6c119db751045a59d804c4a40957600e945323fc 100644 (file)
@@ -199,101 +199,6 @@ XCOMM  Sun libraries
 XCOMM <<-----------------------------
 XCOMM 
 
--
-{ sun
-       type = directory
-       install_target = /usr/dt/lib/security
-       mode = 0555
-       status = ------
-}
-XCOMM 
-lib/pam/libpam/libpam.so.2.1
-{ sun
-        install_target = /usr/dt/lib/libpam.so.2.1
-       mode = 0755
-       owner = root
-}
-XCOMM
-./libpam.so.2.1
-{ sun
-        install_target = /usr/dt/lib/libpam.so.1
-       type = sym_link
-}
-XCOMM 
-lib/pam/pam_modules/dial_auth/libpam_dial_auth.so.2.1
-{ sun
-        install_target = /usr/dt/lib/security/pam_dial_auth.so.2.1
-       mode = 0555
-       owner = root
-}
-XCOMM 
-./pam_dial_auth.so.2.1
-{ sun
-        install_target = /usr/dt/lib/security/pam_dial_auth.so.1
-       type = sym_link
-}
-XCOMM 
-lib/pam/pam_modules/rhosts_auth/libpam_rhosts_auth.so.2.1
-{ sun
-        install_target = /usr/dt/lib/security/pam_rhosts_auth.so.2.1
-       mode = 0555
-       owner = root
-}
-XCOMM 
-./pam_rhosts_auth.so.2.1
-{ sun
-        install_target = /usr/dt/lib/security/pam_rhosts_auth.so.1
-       type = sym_link
-}
-XCOMM 
-lib/pam/pam_modules/unix/libpam_unix.so.2.1
-{ sun
-        install_target = /usr/dt/lib/security/pam_unix.so.2.1
-       mode = 0555
-       owner = root
-}
-XCOMM 
-./pam_unix.so.2.1
-{ sun
-        install_target = /usr/dt/lib/security/pam_unix.so.1
-       type = sym_link
-}
-XCOMM 
-./libXm.so.2.1
-{ sun
-       install_target = /usr/dt/lib/libXm.so.1.2
-       type = sym_link
-}
-XCOMM 
-./libXm.so.2.1
-{ sun
-       install_target = /usr/dt/lib/libXm.so.3
-       type = sym_link
-}
-XCOMM 
-./libMrm.so.2.1
-{ sun
-        install_target = /usr/dt/lib/libMrm.so.1.2
-        type = sym_link
-}
-XCOMM 
-./libMrm.so.2.1
-{ sun
-        install_target = /usr/dt/lib/libMrm.so.3
-        type = sym_link
-}
-XCOMM 
-./libUil.so.2.1
-{ sun
-        install_target = /usr/dt/lib/libUil.so.1.2
-        type = sym_link
-}
-XCOMM 
-./libUil.so.2.1
-{ sun
-        install_target = /usr/dt/lib/libUil.so.3
-        type = sym_link
-}
 XCOMM 
 lib/DtHelp/libDtHelp.so.2.1
 { sun
index 8dbda1fd941fc93d85bc9e1855c577f8afb5432e..3713f0f6287b068932b0e7ec08eb37198c6fef55 100644 (file)
@@ -13,7 +13,8 @@ XCOMM $XConsortium: Imakefile /main/25 1996/11/22 11:17:34 drk $
 #define IHaveSubdirs
 #define PassCDebugFlags        /**/
 
-#if defined(LinuxArchitecture) || defined(BSDArchitecture)
+#if defined(LinuxArchitecture) || defined(BSDArchitecture) || \
+    defined(SunArchitecture)
 SUBDIRS = il
 DONES = il/DONE
 #else
@@ -34,7 +35,7 @@ BIT_ORDER_DEFINES = -DLSB_BIT_ORDER
 #endif
 
 INCLUDES = -I. -I./il -I./jpeg
-
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = -DDTLIB $(LOCAL_DEFINES) \
          -DCDE_INSTALLATION_TOP='"$(CDE_INSTALLATION_TOP)"' \
          -DCDE_CONFIGURATION_TOP='"$(CDE_CONFIGURATION_TOP)"' \
@@ -153,7 +154,8 @@ JPEG_OBJS = \
         jpeg/jdinput.o      jpeg/jerror.o       jpeg/jutils.o
 
 SRCS = $(SRCS1) $(SRCS2) $(CVSRCS) $(LCXSRCS)
-#if defined(LinuxArchitecture) || defined(BSDArchitecture)
+#if defined(LinuxArchitecture) || defined(BSDArchitecture) || \
+    defined(SunArchitecture)
 OBJS = $(OBJS1) $(OBJS2) $(CVOBJS) $(LCXOBJS) $(IL_OBJS)
 #else
 OBJS = $(OBJS1) $(OBJS2) $(CVOBJS) $(LCXOBJS) $(IL_OBJS) $(JPEG_OBJS)
index a1962f4278905730dcc0065723df4f5ea2f3291c..88b1d4d24ab2e9c8a6188a75f0422e313576787f 100644 (file)
 ! So the pattern string must be 23, not 32.  Do not go by
 ! the order of 'uname -rv' or 'uname -vr', as that is not used.
 !!!
+SunOS.?.version.<.5120:  "5\\.12.*"
+SunOS.?.version.<.5110:  "5\\.11.*"
+SunOS.?.version.<.5100:  "5\\.10.*"
+SunOS.?.version.<.590:   "5\\.9.*"
+SunOS.?.version.<.580:   "5\\.8.*"
+SunOS.?.version.<.570:   "5\\.7.*"
+SunOS.?.version.<.560:   "5\\.6.*"
 SunOS.?.version.<.550:   "5\\.5.*"
 SunOS.?.version.<.540:   "5\\.4.*"
 SunOS.?.version.<.530:   "5\\.3.*"
index 6070e607b83205df7699b0115b206e7042b3f18d..b62191318313a55e8b2596456d554156ef96ddfc 100644 (file)
@@ -16,6 +16,7 @@ BIT_ORDER_DEFINES = -DLSB_BIT_ORDER
 #endif
 
 INCLUDES = -I. -I..
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = -DDTLIB $(LOCAL_DEFINES) \
          -DCDE_INSTALLATION_TOP='"$(CDE_INSTALLATION_TOP)"' \
          -DCDE_CONFIGURATION_TOP='"$(CDE_CONFIGURATION_TOP)"' \
index 5ae6955a481ff11b773e324fa355bcf8815b736d..889af093023c297596a70592ec6da55cd023af58 100644 (file)
@@ -14,6 +14,7 @@ XCOMM $XConsortium: Imakefile /main/2 1996/04/21 19:14:49 drk $
 REQUIREDLIBS = SharedDtMrmReqs
 #endif
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 INCLUDES = -I. -I$(DTHELPSRC) -I$(DTTERMSRC)/Term -I$(DTTERMSRC)/TermPrim
 
 
index 97e332eb9fe188a23a4e18a00732910f7214888f..8f431a92577e7472e8760a3d2e183c72e79cb7d4 100644 (file)
@@ -10,6 +10,7 @@ XCOMM $XConsortium: Imakefile /main/11 1996/10/31 02:09:04 cde-hp $
 #ifndef DtPrintDefines
 # define DtPrintDefines                -DMULTIBYTE -DI18N_MSG
 #endif
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = DtPrintDefines
 INCLUDES = -I.
 
index 5ba42b9d8a52dea27af608e496ea4313a431f30d..248fd0cf3b512376cb4dd972d2da1e84ca71be83 100644 (file)
@@ -17,6 +17,10 @@ EXTRA_DEFINES = -DBYTE_SWAP
 EXTRA_DEFINES = -DBYTE_SWAP
 #endif
 
+#if defined(SunArchitecture)
+EXTRA_DEFINES = -DBYTE_SWAP
+#endif
+
 MakeSubdirs($(SUBDIRS))
 ForceSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))
index a47c15b9c42bcf573b2161cce1c6b43ec634b067..b2c9fac355c44c9bc0988bf5cd9a5f718b633544 100644 (file)
@@ -27,6 +27,10 @@ EXTRA_DEFINES = -D_XOPEN_SOURCE
 EXTRA_DEFINES = -DBYTE_SWAP -D_XOPEN_SOURCE=700
 #endif
 
+#if defined(SunArchitecture)
+EXTRA_DEFINES = -DBYTE_SWAP -D_XOPEN_SOURCE=700
+#endif
+
 #define DoNormalLib    NormalLibDtSearch
 #define DoSharedLib    SharedLibDtSearch
 #define DoDebugLib     DebugLibDtSearch
index ba0c273308c98e166ea829f08296e3d0a935da5b..45670198c585df5baffca1a15ab061f69f7413c2 100644 (file)
@@ -86,7 +86,7 @@
 # define __SVR4_I386_ABI_L1__
 #endif
 #include <limits.h>    /* pickup WORD_BIT, LONG_BIT */
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 # undef __SVR4_I386_ABI_L1__
 # ifndef WORD_BIT
 # define WORD_BIT 32
index 84429e250ea9350171c8623749b291be906a8ae4..15b4e14cc42e2c7fc94ee3fa1d865353ba8ea7ef 100644 (file)
@@ -21,6 +21,7 @@ XCOMM (c) Copyright 1996 Hitachi.
 #ifndef DtSvcDefines
 # define DtSvcDefines  -DMULTIBYTE
 #endif
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = DtSvcDefines \
           -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \
           -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
index c72ed3dab93e329a8a52c46a971a9118bfdcd553..3699fe7b8c3adbf83a4dee79a6824e3b5581ddef 100644 (file)
@@ -14,6 +14,7 @@ XCOMM $XConsortium: Imakefile /main/6 1996/08/20 14:48:27 drk $
 #ifndef DtSvcDefines
 # define DtSvcDefines -DMULTIBYTE
 #endif
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = DtSvcDefines \
           -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
           -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\"
index 0fa0238c60b76d10e4f3ce48b3bcb866f218e7c5..faf13469163ba6fe703bfa62829012c4d33b7b30 100644 (file)
@@ -13,6 +13,7 @@ XCOMM $TOG: Imakefile /main/14 1998/04/22 14:18:31 mgreess $
 #ifndef DtSvcDefines
 # define DtSvcDefines  -DMULTIBYTE
 #endif
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = DtSvcDefines \
           -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
           -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\"
index f2dc2f7229b12d0f4a954aa98e5206d1f3fb1748..3585cb8babf234cab0448f40da9e6d2e3d425f99 100644 (file)
@@ -30,8 +30,10 @@ INCLUDES = -I.
 
 #ifdef SharedDtSvcReqs
 #ifdef SunArchitecture
-REQUIREDLIBS = SharedDtSvcReqs -lC -lCrun
+REQUIREDLIBS = SharedDtSvcReqs
+#ifndef HasGcc2
 SHLIBLDFLAGS = -G
+#endif
 #else
 REQUIREDLIBS = SharedDtSvcReqs
 #endif
index 51f03cd2613d983ce6c10b821eac0c1fac992a40..ae276ba6948efd7066fb7c90f23c8be823cd7568 100644 (file)
@@ -36,7 +36,7 @@
 #ifndef __DYNARRAY_H_
 #define __DYNARRAY_H_
 
-#if !defined(linux) && !defined(CSRG_BASED)
+#if !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
 #include <generic.h>
 #endif
 #if defined(USL) || defined(__uxp__) || defined(__osf__) || defined(sun) || defined(linux) || defined(CSRG_BASED)
index 1b7ff96af0de011bbda746f204cefafe1a8c7900..374683dddb8aafc2615c8d0cdd75085ee3484945 100644 (file)
@@ -10,6 +10,7 @@ XCOMM $XConsortium: Imakefile /main/1 1996/04/21 19:15:07 drk $
 
 #include <Threads.tmpl>
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES =
 INCLUDES = -I. -I../TermPrim
 
index 04277ae2a6ffcc224e811c6a93f81ad2865054c8..dc16d8fbeec5b7feee297ff6c252a34e36df2b6b 100644 (file)
@@ -10,6 +10,7 @@ XCOMM   $TOG: Imakefile /main/3 1998/03/16 14:41:32 mgreess $
 
 #include <Threads.tmpl>
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = $(ARCHITECTURE_DEFINES)
 
 INCLUDES = -I.
index fc0c27d6d9a8551a38ebb4d4afbc7099600d4559..c79d8a108e618f5e1eb6db7f86b840384c35f461 100644 (file)
@@ -39,7 +39,7 @@ static char rcs_id[] = "$XConsortium: TermPrimDebug.c /main/4 1996/11/21 19:58:1
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 # include <stdarg.h>
 #else
 # include <varargs.h>
index 235582e61a86bb0e8c0b24ba86acb610808bc9ee..56e16ca999a0af5cf31eac426d56c57907a53b6f 100644 (file)
@@ -10,6 +10,7 @@ XCOMM $XConsortium: Imakefile /main/1 1996/04/21 19:20:11 drk $
 
 #include <Threads.tmpl>
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 INCLUDES = -I. -I../TermPrim -I../Term
 
 SRCS = \
index 5f312bc88ffacbd8958a3b29d757ba16589b26dc..8cec73681d698fa0e5eab4c5218295f97e4f1240 100644 (file)
@@ -12,6 +12,7 @@ XCOMM $XConsortium: Imakefile /main/8 1996/04/21 19:11:16 drk $
 #ifndef DtWidgetDefines
 # define DtWidgetDefines       -DI18N_MSG -DMULTIBYTE
 #endif
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = DtWidgetDefines
 #if defined(LinuxArchitecture)
 INCLUDES = -I. -I/usr/include/freetype2
index 41373e5f41f2febccd22d81d8f79a2a38223da57..a2d8dfccf3582c2ee5750fa29edcd9ee175141fa 100644 (file)
@@ -24,9 +24,11 @@ REQUIREDLIBS = SharedCsaReqs
 #endif
 
 #ifdef SunArchitecture
-  EXTRA_DEFINES = -xstrconst -v -DSunOS=$(OSMAJORVERSION)$(OSMINORVERSION)
+  EXTRA_DEFINES = -v -DSunOS=$(OSMAJORVERSION)$(OSMINORVERSION)
+#ifndef HasGcc2
   SHLIBLDFLAGS = -G -z text -z defs
 #endif
+#endif
 
 #ifdef HPArchitecture
   EXTRA_DEFINES = -DHPUX
index 369be76058b91cc19af6d0b0907cbf1079a0e506..f10301e9b4fe55eba217a4a8e5c5bcf6e9e8cbbc 100644 (file)
@@ -1,7 +1,7 @@
 XCOMM $XConsortium: Imakefile /main/14 1996/05/08 09:27:35 drk $
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
 
 #include <Threads.tmpl>
index 82ce6b83c7d988bea85bd3c713ff2b1b9e10986d..0e00641ccaabb9d8394339aad762f9440d8befa8 100644 (file)
@@ -1,7 +1,7 @@
 XCOMM $XConsortium: Imakefile /main/14 1996/05/08 09:28:02 drk $
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
 
 #include <Threads.tmpl>
index 8a538c6f830b47a9180e7a966c9076e65d730a22..d82716173ab00dd1ef53b7904ae0f2be7ff000d8 100644 (file)
@@ -1,7 +1,7 @@
 XCOMM $XConsortium: Imakefile /main/15 1996/09/30 13:50:43 drk $
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
 
 #include <Threads.tmpl>
index bc48e6e5a86fd6855904deb66ef9f9b70a6fd984..b8bce583b29374b6d09d98419ccd3c6d5bd0aad7 100644 (file)
@@ -214,10 +214,10 @@ main(int argc, char** argv, char **envp)
        void install_signal_handler();
        SVCXPRT *transp;
        struct sockaddr_in saddr;
-#if defined(DEC) || defined(sun) || defined(HPUX)
+#if defined(DEC) || defined(HPUX)
        int asize = sizeof(struct sockaddr);
 #else
-# if defined(linux) || defined(CSRG_BASED)
+# if defined(linux) || defined(CSRG_BASED) || defined(sun)
        socklen_t asize;
 # else
        size_t asize = sizeof(struct sockaddr);
index f7b742512b950385e1466744844cc2941c44f253..890888934992b8ee4190f317ab54da4f8f72c745 100644 (file)
@@ -1,7 +1,7 @@
 XCOMM $XConsortium: Imakefile /main/15 1996/10/09 14:02:13 drk $
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
 
 #include <Threads.tmpl>
index 1a3ac125a55fdae1ffc0e43ec015cb82cfccf2c8..3f4c87f5c8c3f76ce0b2c7c9f4bf2429c70cb805 100644 (file)
@@ -1,7 +1,7 @@
 XCOMM $XConsortium: Imakefile /main/11 1996/05/08 09:28:48 drk $
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
 
 #include <Threads.tmpl>
index 8b15f3acf97c9be466a9359029c821ff8546b49f..d5ffce2765db69c2a7aa519285341540d39086dc 100644 (file)
@@ -1,7 +1,7 @@
 XCOMM $XConsortium: Imakefile /main/14 1996/10/09 14:02:22 drk $
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
 
 #include <Threads.tmpl>
index 877cb5e02d11d4ff6e0c85c77d1c2c85afc2d93d..f0a1de8751312a1e41e5b485dbf9d1b2f24ea041 100644 (file)
@@ -45,8 +45,10 @@ INCLUDES = -I.
 
 #ifdef SharedTtReqs
 #ifdef SunArchitecture
-REQUIREDLIBS = SharedTtReqs -lC -lCrun
+REQUIREDLIBS = SharedTtReqs
+#ifndef HasGcc2
 SHLIBLDFLAGS = -G
+#endif
 #else
 REQUIREDLIBS = SharedTtReqs
 #endif
index 76b821eb4fc5b78e2e648f1eeade5df693486007..74369d0a4b0bf426fc0bcf23e277504b877c76b6 100644 (file)
@@ -12,7 +12,7 @@ XCOMM $TOG: Imakefile /main/9 1999/08/30 10:50:55 mgreess $
 #endif
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
 #include <Threads.tmpl>
 
index 8f82a8bce3c0872603b9cd6eae347d166d1a660c..2c96e81f140b8eb030fdeb6fb1e6de412faab016 100644 (file)
@@ -9,7 +9,7 @@ XCOMM $XConsortium: Imakefile /main/7 1996/04/21 19:12:19 drk $
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(ISAM_INCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(ISAM_INCLUDES) $(DEPENDDEFINES)
 
 #include <Threads.tmpl>
 
index ddce718051097461ff5beb0d293c39b48f65c721..f30be12593aa28a4019db7d20130bdb2d2cf03a1 100644 (file)
@@ -9,7 +9,7 @@ XCOMM $TOG: Imakefile /main/8 1999/08/30 10:52:07 mgreess $
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(ISAM_INCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(ISAM_INCLUDES) $(DEPENDDEFINES)
 
 #include <Threads.tmpl>
 
index cb8379f1eaea7f442e81e8f973420b949dc6e5d5..5bc87dbf244568a9f670627fc9809844950d4791 100644 (file)
 
 # undef  OPT_UNIX_SOCKET_RPC 
 # define OPT_TLI 
-# if defined(PROF) /* can't use dlopen if profiling. */
-#  undef  OPT_DLOPEN_X11 
-#  undef  OPT_DLOPEN_CE 
-# else
-#  define OPT_DLOPEN_X11 
-#  define OPT_DLOPEN_CE 
-# endif
+# undef  OPT_DLOPEN_X11
+# undef  OPT_DLOPEN_CE
 # undef  OPT_ADDMSG_DIRECT 
 # define OPT_SECURE_RPC 
 # undef  OPT_CLASSING_ENGINE
 # undef  OPT_DEFINE_SIG_PF
 # define OPT_TAR_HAS_EXCLUDE_OPTION
 
-# define OPT_BUG_SUNOS_5
-
 # define OPT_HAS_REALPATH
 # undef  OPT_AUTOMOUNT_PATH_FIX
 
index 4271fa8e27475cf1f9bd16b69603cffd183029cf..a6dc05a3c72bf9260d8ca424bf23c062bcc4644d 100644 (file)
@@ -12,7 +12,7 @@ XCOMM $XConsortium: Imakefile /main/6 1996/05/07 19:13:02 drk $
 #endif
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
 #include <Threads.tmpl>
 
index c6d6856587d8741b10e41391a3e3ab985257133b..b1ae307ca3e1083db151328885880f2fa40278f2 100644 (file)
@@ -9,7 +9,7 @@ XCOMM $XConsortium: Imakefile /main/9 1996/08/29 16:11:24 barstow $
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
 #include <Threads.tmpl>
 
index 1c4516610225f6fae45cc10ab5894b1039667bab..7b9fb442d99a27e4196e79361f44b18b94f68382 100644 (file)
@@ -229,6 +229,11 @@ load_xt_fns_from_handle(void *xt_handle)
        if ( _tt_xt . fn  == (_Tt_xfn_ptr)0) {                          \
                return(0);                                              \
        }                                                               
+#define        DLINK_FNV(fn)\
+       _tt_xt . fn = (void*)(_Tt_xfn_ptr)dlsym(xt_handle, #fn);        \
+       if ( _tt_xt . fn  == (_Tt_xfn_ptr)0) {                          \
+               return(0);                                              \
+       }
 #else /* __STDC__ */
 #define        DLINK_FN(fn)\
        _tt_xt . fn = (_Tt_xfn_ptr)dlsym(xt_handle, "fn");              \
@@ -250,7 +255,7 @@ load_xt_fns_from_handle(void *xt_handle)
        DLINK_FN(XtAppAddTimeOut)
        DLINK_FN(XtRemoveTimeOut)
        DLINK_FN(XtAppProcessEvent)
-       DLINK_FN(applicationShellWidgetClass)
+       DLINK_FNV(applicationShellWidgetClass)
        return(1);
 }
 
index 02855d358fc84243501c4bbc13c6e6b191724334..e45d4ef2daa885a93a6a7e4eb7fb94cce7a4ce50 100644 (file)
@@ -54,7 +54,7 @@
 #endif
 #include <stdlib.h>
 #include <ctype.h>
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <wctype.h>
 #endif
 #include "util/tt_string.h"
index 200cf69fe6517a8f8347eac95b2bda68e3215268..ac159799ad81ea994616657a549ebe7207264b7e 100644 (file)
@@ -11,6 +11,7 @@ XCOMM $XConsortium: Imakefile /main/4 1996/04/21 19:12:37 drk $
 
 #include "../tooltalk.tmpl"
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 INCLUDES = -I.
 
 SRCS = isaddindex.c isamaddindex.c isopen.c isamopen.c \
index 1e28ddf9e4f7c08b447bbfa2c731de5acb20d96e..0792953800d2a153d421fa4f0a4c6f3c6b0a748c 100644 (file)
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)iscntl.c  1.8 94/11/17";
  *     Generic control function
  */
 
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <stdarg.h>
 #else
 #include <varargs.h>
@@ -79,7 +79,7 @@ static char sccsid[] = "@(#)iscntl.c  1.8 94/11/17";
 
 typedef int (* intfunc)();
 
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 int 
 iscntl(int isfd, int func, ...)
 #else
@@ -94,7 +94,7 @@ iscntl(isfd, func, va_alist)
     va_list            pvar;
     int                        ret;
 
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
     va_start(pvar, func);
 #else
     va_start(pvar);
index 86c180f7cb73d1480e0cc5da8fa6ebb17078f0e3..887929bb76979321223ac22ed84578f7560aec26 100644 (file)
@@ -8,7 +8,7 @@ XCOMM $TOG: Imakefile /main/7 1999/08/30 11:01:36 mgreess $
 #define LibInstall     NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
 #include <Threads.tmpl>
 
index 68e9819e546b09dfa272be45e186f20809436dc0..98472ab1ec64d826466b2723c9cddb654d8bdc89 100644 (file)
@@ -100,7 +100,7 @@ static      gid_t   req_auth_gids[NGROUPS_MAX];
 #endif /* OPT_BUG_SUNOS_4 */
 
 #if defined(OPT_BUG_SUNOS_5)
-       typedef (*Hack_getucred)(const struct authdes_cred *,
+       typedef void (*Hack_getucred)(const struct authdes_cred *,
                                 uid_t *,
                                 gid_t *,
                                 short *,
diff --git a/cde/programs/backdrops/SunLogo.pm b/cde/programs/backdrops/SunLogo.pm
new file mode 100644 (file)
index 0000000..1a21db7
--- /dev/null
@@ -0,0 +1,57 @@
+/* XPM */
+static char * SunLogo[] = {
+/* width height ncolors cpp [x_hot y_hot] */
+"48 48 3 1 0 0",
+/* colors */
+"     s #727288889f9f m white c #bbbbccccdddd",
+".    s #9191a8a8bfbf m black c #9191a8a8bfbf",
+"+    s #bbbbccccdddd m black c #727288889f9f",
+/* pixels */
+" ... .+++. .+++. .+++++. ... .+++. .+++. .+++++.",
+".   .+++. .+++. .+++.+++.   .+++. .+++. .+++.+++",
+".   .++. .+++. .+++. .++.   .++. .+++. .+++. .++",
+".   .+++.+++. .+++. .+++.   .+++.+++. .+++. .+++",
+" ... .+++++. .+++. .+++. ... .+++++. .+++. .+++.",
+".+++. .+++. .+++. .+++. .+++. .+++. .+++. .+++. ",
+"+++++. ... .+++. .+++. .+++++. ... .+++. .+++. .",
+"++.+++.   .+++. .+++. .+++.+++.   .+++. .+++. .+",
+"+. .+++. .+++. .+++.  .++. .+++. .+++. .+++.  .+",
+"++. .+++. .+. .+++. . .+++. .+++. .+. .+++. . .+",
+"+++. .+++. . .+++. .+. .+++. .+++. . .+++. .+. .",
+".+++. .+++. .+++. .+++. .+++. .+++. .+++. .+++. ",
+" .+++. .+++. .+. . .+++. .+++. .+++. .+. . .+++.",
+". .+++. .+++. . .+. .+++. .+++. .+++. . .+. .+++",
+"+. .+++. .+++. .+++. .+++. .+++. .+++. .+++. .++",
+"++. .+++. .+. . .+++. .+++. .+++. .+. . .+++. .+",
+"+++. .+++. . .+. .+++. .+++. .+++. . .+. .+++. .",
+".+++. .+++. .+++. .+++. .+++. .+++. .+++. .+++. ",
+" .+++. .+. .+++. . .+++. .+++. .+. .+++. . .+++.",
+". .+++. . .+++. .+. .+++. .+++. . .+++. .+. .+++",
+"+. .++.  .+++. .+++. .+++. .++.  .+++. .+++. .++",
+"++.+++. .+++. .+++.   .+++.+++. .+++. .+++.   .+",
+"+++++. .+++. .+++. ... .+++++. .+++. .+++. ... .",
+".+++. .+++. .+++. .+++. .+++. .+++. .+++. .+++. ",
+" ... .+++. .+++. .+++++. ... .+++. .+++. .+++++.",
+".   .+++. .+++. .+++.+++.   .+++. .+++. .+++.+++",
+".   .++. .+++. .+++. .++.   .++. .+++. .+++. .++",
+".   .+++.+++. .+++. .+++.   .+++.+++. .+++. .+++",
+" ... .+++++. .+++. .+++. ... .+++++. .+++. .+++.",
+".+++. .+++. .+++. .+++. .+++. .+++. .+++. .+++. ",
+"+++++. ... .+++. .+++. .+++++. ... .+++. .+++. .",
+"++.+++.   .+++. .+++. .+++.+++.   .+++. .+++. .+",
+"+. .+++. .+++. .+++.  .++. .+++. .+++. .+++.  .+",
+"++. .+++. .+. .+++. . .+++. .+++. .+. .+++. . .+",
+"+++. .+++. . .+++. .+. .+++. .+++. . .+++. .+. .",
+".+++. .+++. .+++. .+++. .+++. .+++. .+++. .+++. ",
+" .+++. .+++. .+. . .+++. .+++. .+++. .+. . .+++.",
+". .+++. .+++. . .+. .+++. .+++. .+++. . .+. .+++",
+"+. .+++. .+++. .+++. .+++. .+++. .+++. .+++. .++",
+"++. .+++. .+. . .+++. .+++. .+++. .+. . .+++. .+",
+"+++. .+++. . .+. .+++. .+++. .+++. . .+. .+++. .",
+".+++. .+++. .+++. .+++. .+++. .+++. .+++. .+++. ",
+" .+++. .+. .+++. . .+++. .+++. .+. .+++. . .+++.",
+". .+++. . .+++. .+. .+++. .+++. . .+++. .+. .+++",
+"+. .++.  .+++. .+++. .+++. .++.  .+++. .+++. .++",
+"++.+++. .+++. .+++.   .+++.+++. .+++. .+++.   .+",
+"+++++. .+++. .+++. ... .+++++. .+++. .+++. ... .",
+".+++. .+++. .+++. .+++. .+++. .+++. .+++. .+++. "};
index 3cd4537132599bec5904472dff4d0c295a324dd0..72d55e96627cf9984863d85249bdf5504393fc1a 100644 (file)
@@ -1,5 +1,6 @@
 XCOMM $TOG: Imakefile /main/9 1998/04/06 13:11:38 mgreess $
 
+ DEPEND_DEFINES = $(DEPENDDEFINES)
        INCLUDES = -I.
 
 DEPLIBS = $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB)
index ce00f091e3ac3fa41f2a80fea70af886879cf10d..27ca2c8b6b7f87d7ea05781b3c8b5b2ad604e983 100644 (file)
@@ -50,8 +50,8 @@ default_target: all
 /*
  * -xF and -M cause reordering of executable
  */
-LOCAL_LDFLAGS = -M Mapfile
-EXTRA_DEFINES = -D_POSIX_SOURCE=1 -Xa -xF
+LOCAL_LDFLAGS =
+EXTRA_DEFINES = -D_POSIX_SOURCE=1
 
 clean::
        touch .make.state
index b8f68838604e9ad3a7db409bee8df72db7f53313..4a9db50e7a102d49cc9417b81dabbd0ea8281562 100644 (file)
@@ -21,8 +21,9 @@ XCOMM (c) Copyright 1996 Hitachi.
 #include "../ab.tmpl"
 #include "../ab.rules"
 
-    INCLUDES = -I. -I$(ABINCLUDES)
-     DEFINES =
+      INCLUDES = -I. -I$(ABINCLUDES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
+       DEFINES =
 
 SOURCES.h.shipped =
 
index 90e08f803110371c73c237b7c7bef0699e169c0f..320b69153d9bf7cecf87a3815971e90ac8fd3e11 100644 (file)
@@ -29,8 +29,9 @@ XCOMM (c) Copyright 1996 Hitachi.
 #include "../ab.tmpl"
 #include "../ab.rules"
 
-    INCLUDES = -I. -I$(ABINCLUDES)
-     DEFINES =
+      INCLUDES = -I. -I$(ABINCLUDES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
+       DEFINES =
 
 SOURCES.h.shipped=
 
index 8d46684417ae02cc629182b72b2d444937caacd9..41e5c47926bc91dc9e9802ae62cba78d7c2bd036 100644 (file)
@@ -8,7 +8,7 @@ XCOMM $XConsortium: Imakefile /main/10 1996/10/09 14:03:49 drk $
 #define LibInstall     NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
 #include "../ab.tmpl"
 #include "../ab.rules"
index 85413ff128769bd1657aa365cbc91add0c55fa06..af6fdd3113040924cba053b1b77a5d9f13d532fd 100644 (file)
@@ -1,5 +1,6 @@
 XCOMM $TOG: Imakefile /main/11 1997/09/05 11:28:15 samborn $
 
+ DEPEND_DEFINES = $(DEPENDDEFINES)
         DEFINES = -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\"
        INCLUDES = -I.
 
@@ -17,7 +18,7 @@ SYS_LIBRARIES = -lmsaa -liconv
 #endif
 
 #if defined (SunArchitecture)
-SYS_LIBRARIES = -lintl -lsunmath -lm -ldl
+SYS_LIBRARIES = -lintl -lm -ldl
 #endif
 
 #if defined (USLArchitecture)
index 971a9bbe08f4842878f4075a180c542fd221093c..3d55b4d5a2d1a9f75d601ba1d708546a4c21df5e 100644 (file)
@@ -12,6 +12,7 @@ LOCAL_LIBRARIES = ../libDtCmP/libDtCmP.a $(CSALIB) DtClientLibs
 
  OSMAJORVERSION = OSMajorVersion
  OSMINORVERSION = OSMinorVersion
+ DEPEND_DEFINES = $(DEPENDDEFINES)
         DEFINES = -DREL="$(OSMAJORVERSION)$(OSMINORVERSION)" \
        -DRELMAJOR="$(OSMAJORVERSION)" -DRELMINOR="$(OSMINORVERSION)" \
        $(ICONV_INBUF_DEFINE)
index 72b7fbd65b1786c40073c910bb1ed7a70bc172df..600f339e1277b5e1372f70c6a6df4b16a5b2467b 100644 (file)
@@ -12,6 +12,7 @@ INCLUDES = -I. -I$(CSASRC)
 OSMAJORVERSION = OSMajorVersion
 OSMINORVERSION = OSMinorVersion
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = -DRFC_MIME -DLINE_COUNT -DV2 -DOW_I18N \
        -DREL="$(OSMAJORVERSION)$(OSMINORVERSION)" \
        -DRELMAJOR="$(OSMAJORVERSION)" -DRELMINOR="$(OSMINORVERSION)"
@@ -38,6 +39,8 @@ OBJS =        cm_tty.o        cmfns.o         dtfns.o \
        getdate.o       props.o         resource.o \
        timeops.o       util.o
 
+YaccFileNoFlags(getdate)
+
 #include <Library.tmpl>
 
 DependTarget()
index 07180fb3d7da83c3f8fa6cab9a4382af910d65c7..4d5fba7a2f3885420ccb89fa2f2f43e29dfe101c 100644 (file)
@@ -14,6 +14,7 @@ XCOMM
  * It should be set when necessary to the real library macro name.
  */
 
+ DEPEND_DEFINES = $(DEPENDDEFINES)
        INCLUDES = -I.
 #if defined (SunArchitecture)
 DEPLIBS = $(DEPDTWIDGETLIB) $(DEPDTSVCLIB) \
@@ -42,7 +43,7 @@ SYS_LIBRARIES = -lm -liconv
 #endif
 
 #if defined (SunArchitecture)
-SYS_LIBRARIES = -lm -ldl -lC
+SYS_LIBRARIES = -lm -ldl
 #endif /* SunArchitecture */
 
 #if defined (USLArchitecture)
index 0b0af5c70d52e039f304b47f71d3f9354dcd7d32..b5e1c7c73bf3743a9f26954f7c9d64edfade84b6 100644 (file)
@@ -28,6 +28,8 @@ TCL_LIBRARY = TclLibrary
 TCL_LIBRARY =  $(prefix)/tcl$(VERSION)
 #endif
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
+
 #if defined(SunArchitecture)
 EXTRA_DEFINES = -DTCL_LIBRARY=\"${TCL_LIBRARY}\" \
        -DNO_UNION_WAIT -DHAVE_UNISTD_H -DNEED_MATHERR \
index fb359dee3bf2ee3dc7b6a4b0bc21d2b50c8f112d..5c426de6059a33ef143e826c6722d0f2fba8027b 100644 (file)
@@ -2,6 +2,7 @@ XCOMM $XConsortium: Imakefile /main/7 1996/09/14 15:17:32 drk $
 
 DEPLIBS = $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
 LOCAL_LIBRARIES = $(TTLIB) $(XTOOLLIB) $(XLIB)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = -DMSGLOG_CLIENT_ONLY
 INCLUDES = -I. 
 
index abe6a40b80553b8e8946ebb6aa15f3c17d4da860..039efe9d1dda2201ba467f95783eae32296cde7d 100644 (file)
@@ -9,6 +9,7 @@ ForceSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))
 
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = -DMULTIBYTE -DSHAPE -D_ILS_MACROS -DSUN_PERF \
        -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
        -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \
index 1447adc9e37d3189ed5793c574da341235787b44..30773f69942c03b4b4df44e3c62e030b18874607 100644 (file)
@@ -1,5 +1,6 @@
 XCOMM $XConsortium: Imakefile /main/7 1996/09/14 15:17:43 drk $
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = -DSHAPE
 
 DEPLIBS = DepDtClientLibs
index d98ce9cd993254841537bce29bc08a0055ac54ed..83bd4679f13709721489f7e5edef392171073e2e 100644 (file)
@@ -11,7 +11,7 @@ EXTRA_DEFINES = -DHP_COLOR
 #endif
 
 #if defined(SunArchitecture)
-SYS_LIBRARIES = -lm -ldl -lgen -lC
+SYS_LIBRARIES = -lm -ldl -lgen
 #endif
 
 #if defined(USLArchitecture)
index d02c49543fa99dfe52b30b3ddeacbe5450379f87..9bcc9a6f7cb21ce4611a0e62d649367466c13549 100644 (file)
@@ -10,6 +10,7 @@ XCOMM $XConsortium: Imakefile /main/7 1996/09/14 15:26:24 drk $
 
 PROGRAMS = dthelpdemo
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = -D_BMS
 INCLUDES =  -I.
 
index 1875a14d0d35a47e3481ee81c993ff4daeaa797c..177a96acb375babb1d8a1dcfd0bd614fdc3c09cf 100644 (file)
@@ -1,6 +1,7 @@
 XCOMM $XConsortium: Imakefile /main/7 1996/09/14 15:26:44 drk $
 PROGRAMS = dthelpview
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = -D_BMS
 INCLUDES = -I. 
 
index 767aa5ba990b6f14efb5bb6a2623faeec4bdda21..699a125939cb8459c84c4ccb970e154aeff28851 100644 (file)
@@ -71,5 +71,4 @@ while (TRUE)
     #include "case.c"
     if (m_token == ENDFILE) exit(FALSE) ;
     }
-    return 0;
 }
index 39bc025ce3cd0520802d69b10b6e3a7991645638..bfedcc864ba86efd4f3dd0317006bf8ddc79ff40 100644 (file)
@@ -267,9 +267,9 @@ switch (newpar->type)
              ret = mbtowc(string, " ", 1);
              }
          }
-      return ;
     }
     (void) ret;
+    return;
 }
 
 /* Called at end of parameter attribute list rule */
index 76e586a3056295e842b834f60b6268e774f6c4cf..2e591fd658039098525a7ae0669d10dc08d9f06b 100644 (file)
@@ -160,13 +160,13 @@ while (TRUE)
        char mbyte[32]; /* bigger than the biggest multibyte char */
 
        ret = wctomb(mbyte, c);
+       (void) ret;
 
        fprintf(stderr, "\n'%s' (%d)", mbyte, c);
        fprintf(m_errfile, "\n'%s' (%d)", mbyte, c);
        m_error("Unexpected character");
        }
     } /* End while */
-    (void) ret;
 }   /* End scan */
 
 #include "scanutil.c"
index ef3da7a7df070d4dfe32740da341cf627177876e..a0ab8653bd31e1fce889125ee90ec81d8ff4ceb3 100644 (file)
@@ -60,7 +60,7 @@ EXTRA_LOAD_FLAGS = -Wl,-a archive
 #endif
 
 #if defined (SunArchitecture)
-SYS_LIBRARIES = -lm -ldl -lgen -lC
+SYS_LIBRARIES = -lm -ldl -lgen
 #endif /* SunArchitecture */
 
 all:: $(OBJS)
index 21ab4c3e6ab97811c27463b2989caab9202f155b..c6390669dece99a6730f8fccc8b740ceb683d1c4 100644 (file)
@@ -78,7 +78,7 @@ LOCAL_LIBRARIES = $(HELPUTILLIB)
 SYS_LIBRARIES = $(XLIB) DtClientSysLibs
 
 #if defined (SunArchitecture)
-SYS_LIBRARIES = $(XLIB) -lm -ldl -lgen -lC
+SYS_LIBRARIES = $(XLIB) -lm -ldl -lgen
 #endif /* SunArchitecture */
 
 all:: $(HELPTAGSRC)/dthelp_ctag1
index 8475803c3dcb71ad44c5540fb09253e628148a69..0b5ca710176b448ee34ea6b4987f2820713c755d 100644 (file)
@@ -98,7 +98,7 @@ void m_free(block, msg)
 #if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__uxp__)
       snprintf(buffer, 32, "%5x:%5x",
         (unsigned int) ((unsigned long) block >> 16),
-        (unsigned int) block, msg) ;
+        (unsigned int) block) ;
 #else
       snprintf(buffer, 32, "  %9p", block) ;
 #endif
index 73474fbfb1dd90998743944c5649d57c8789e081..87eb4eba35c4880f2f21f0a34b53104b5b9f1fa3 100644 (file)
@@ -71,5 +71,4 @@ while (TRUE)
     #include "case.c"
     if (m_token == ENDFILE) exit(FALSE) ;
     }
-    return 0;
 }
index 828c00024624f02b5e105ce563ae11a6ddee5af9..f3792edd9e8dee55753a9f5134a3ecbf471f4534 100644 (file)
@@ -267,9 +267,9 @@ switch (newpar->type)
              ret = mbtowc(string, " ", 1);
              }
          }
-      return ;
     }
     (void) ret;
+    return;
 }
 
 /* Called at end of parameter attribute list rule */
index 48baaea0bcabd0aa506818c2de29667919780717..4f77683d076f134fd8a7e9e2dbd51df888025e23 100644 (file)
@@ -160,13 +160,13 @@ while (TRUE)
        char mbyte[32]; /* bigger than the biggest multibyte char */
 
        ret = wctomb(mbyte, c);
+       (void) ret;
 
        fprintf(stderr, "\n'%s' (%d)", mbyte, c);
        fprintf(m_errfile, "\n'%s' (%d)", mbyte, c);
        m_error("Unexpected character");
        }
     } /* End while */
-    (void) ret;
 }   /* End scan */
 
 #include "scanutil.c"
index 32d9cd5ace81baba448cb019f4565cb09b97f9f2..9a2329d3f12498f5ab9025807474fe906803d563 100644 (file)
@@ -60,7 +60,7 @@ EXTRA_LOAD_FLAGS = -Wl,-a archive
 #endif
 
 #if defined (SunArchitecture)
-SYS_LIBRARIES = -lm -ldl -lgen -lC
+SYS_LIBRARIES = -lm -ldl -lgen
 #endif /* SunArchitecture */
 
 all:: $(OBJS)
index ec19e5a55cabe5067fb46ad1627bf8643be4e1d3..e583464faeae4a63a2fe3eca47eb4c3b87229517 100644 (file)
@@ -78,7 +78,7 @@ LOCAL_LIBRARIES = $(HELPUTILLIB)
 SYS_LIBRARIES = $(XLIB) DtClientSysLibs
 
 #if defined (SunArchitecture)
-SYS_LIBRARIES = $(XLIB) -lm -ldl -lgen -lC
+SYS_LIBRARIES = $(XLIB) -lm -ldl -lgen
 #endif /* SunArchitecture */
 
 all:: $(HELPTAGSRC)/dthelp_htag1
index 7a6ed78ec8aae0bc29d5fb0e85a73f30fa29f8fa..d05804631651f794e94a375a5612582d0ce93044 100644 (file)
@@ -98,7 +98,7 @@ void m_free(block, msg)
 #if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__uxp__)
       snprintf(buffer, 32, "%5x:%5x",
         (unsigned int) ((unsigned long) block >> 16),
-        (unsigned int) block, msg) ;
+        (unsigned int) block) ;
 #else
       snprintf(buffer, 32, "  %9p", block) ;
 #endif
index 97cbb35c0bc731cf83fe3777fd1dcdbf1fa75ebd..f268edc29f58b6e4c0ef0f91546caec173a05d72 100644 (file)
@@ -71,5 +71,4 @@ while (TRUE)
     #include "case.c"
     if (m_token == ENDFILE) exit(FALSE) ;
     }
-    return 0;
 }
index 1e3bfb8d37be17636bc9772c4992fa215851e42f..881a19d3a293dc110ec12d8cde2e08c9087daa95 100644 (file)
@@ -267,9 +267,9 @@ switch (newpar->type)
              ret = mbtowc(string, " ", 1);
              }
          }
-      return ;
     }
     (void) ret;
+    return;
 }
 
 /* Called at end of parameter attribute list rule */
index f0a33ed6a5bf00ba40baead5c18e1f52ad28179c..82443021ad3178387b24381c18169824a22e8266 100644 (file)
@@ -160,13 +160,13 @@ while (TRUE)
        char mbyte[32]; /* bigger than the biggest multibyte char */
 
        ret = wctomb(mbyte, c);
+       (void) ret;
 
        fprintf(stderr, "\n'%s' (%d)", mbyte, c);
        fprintf(m_errfile, "\n'%s' (%d)", mbyte, c);
        m_error("Unexpected character");
        }
     } /* End while */
-    (void) ret;
 }   /* End scan */
 
 #include "scanutil.c"
index aebe90e57087ecdbc132e713f28679b0025a521d..040d710a5697e669390ab5fa8d28bf12a2eacf93 100644 (file)
@@ -52,7 +52,7 @@ EXTRA_LOAD_FLAGS = -Wl,-a archive
 #endif
 
 #if defined (SunArchitecture)
-SYS_LIBRARIES = -lm -ldl -lgen -lC
+SYS_LIBRARIES = -lm -ldl -lgen
 #endif /* SunArchitecture */
 
 all:: $(OBJS)
index 8ea6664ec860df2d3f15a4d22e4de9fd8381aa51..478758be16408b409d969b2c148ce54a7c596b66 100644 (file)
@@ -69,7 +69,7 @@ LOCAL_LIBRARIES = $(SDLUTILLIB)
 SYS_LIBRARIES = $(XLIB) DtClientSysLibs
 
 #if defined (SunArchitecture)
-SYS_LIBRARIES = $(XLIB) -lm -ldl -lgen -lC
+SYS_LIBRARIES = $(XLIB) -lm -ldl -lgen
 #endif /* SunArchitecture */
 
 all:: $(HTAG2SRC)/dthelp_htag2
index 7898856c2b6093ea60d307eeb9bd2bb764b094c9..7eff9d8e23bcf51dd94e38df72c34b156434b23e 100644 (file)
@@ -98,7 +98,7 @@ void m_free(block, msg)
 #if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__uxp__)
       snprintf(buffer, 32, "%5x:%5x",
         (unsigned int) ((unsigned long) block >> 16),
-        (unsigned int) block, msg) ;
+        (unsigned int) block) ;
 #else
       snprintf(buffer, 32, "  %9p", block) ;
 #endif
index 9ea9d850a395be37915f7536cd7d570bcb740e81..f630c5f886d3a81a702bfe2e6c03db63402373e5 100644 (file)
@@ -13,8 +13,10 @@ XCOMM
  * It should be set when necessary to the real library macro name.
  */
 
-        DEFINES = -D__TOOLTALK
-       INCLUDES = -I.
+DEPEND_DEFINES = $(DEPENDDEFINES)
+DEFINES = -D__TOOLTALK
+INCLUDES = -I.
+
 #if defined (SunArchitecture)
 DEPLIBS = $(DEPDTWIDGETLIB) $(DEPDTSVCLIB) $(DEPTTLIB) \
                   $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB)
index e0f5b884f34d443c4abd568fb81d2d7e8c562e24..dafc118fef95252b02da4a5136525cc0ca163da4 100644 (file)
@@ -34,7 +34,7 @@
 class hardCopyRendererException : public Exception
 {
 public:
-  DECLARE_EXCEPTION(hardCopyRendererException, Exception);
+  DECLARE_EXCEPTION(hardCopyRendererException, Exception)
 };
 
 #define CASTHCREXCEPT
index 79711ea658e46c506e4e42aaab51a6f0f83b0057..4e15e160520452b651dcbcba745779928ca2552b 100644 (file)
@@ -237,7 +237,7 @@ int autoNumberAlphabetic::alphaToInt(const char* alpha, enum CaseType a_case)
       expansionFactor *= base;
    }
 
-   x += int((pow(base, digits)-1) / (base-1)) - 1;
+   x += int((pow((double)base, digits)-1) / (base-1)) - 1;
   
    return x;
 }
@@ -270,7 +270,7 @@ const char* autoNumberAlphabetic::intToAlpha(int x, enum CaseType a_case)
      throw(CASTHCREXCEPT hardCopyRendererException());
    }
 
-   int digits = int(log((base-1)*x + base) / log(base));
+   int digits = int(log((double)(base-1)*x + base) / log((double)base));
 
    if ( digits > 50 ) {
      MESSAGE(cerr, "alphabetic autonumber value too large");
@@ -280,7 +280,7 @@ const char* autoNumberAlphabetic::intToAlpha(int x, enum CaseType a_case)
    //debug(cerr, digits);   
    //debug(cerr, (pow(base, digits)-1) / (25) -1);
 
-   x -= int((pow(base, digits)-1) / (base-1)) - 1;
+   x -= int((pow((double)base, digits)-1) / (base-1)) - 1;
 
    char* letters = 
        (a_case == UPPER ) ? f_upperCaseLetters : f_lowerCaseLetters; 
index 8bae5433f13e8ccaf3b54a39cc58e206d9c717cb..4aaf6ebe55f60eba798fb8b515349bef7331c507 100644 (file)
@@ -23,8 +23,10 @@ MMDB_SUBDIRS = HardCopy StyleSheet dti_cc
 
 #ifdef SharedDtMmdbReqs
 #ifdef SunArchitecture
-REQUIREDLIBS = SharedDtMmdbReqs -L/opt/SUNWspro/SC4.0/lib -Bstatic -lC -Bdynamic
+REQUIREDLIBS = SharedDtMmdbReqs
+#ifndef HasGcc2
 SHLIBLDFLAGS = -G
+#endif
 #else
 REQUIREDLIBS = SharedDtMmdbReqs
 #endif
index 57142d1149a933610063429eae2e903eade5c449..eb6e7f9062f75cd0ea4bdacd3f14bab24badac84 100644 (file)
@@ -248,7 +248,8 @@ DocParser::process(istream &input, ostringstream &output,
     !defined(__uxp__) && \
     !defined(USL) && \
     !defined(linux) && \
-    !defined(CSRG_BASED)
+    !defined(CSRG_BASED) && \
+    !defined(sun)
            volatile
 #endif
            AttributeList *attrs = 0;
@@ -258,7 +259,8 @@ DocParser::process(istream &input, ostringstream &output,
     !defined(__uxp__) && \
     !defined(USL) && \
     !defined(linux) && \
-    !defined(CSRG_BASED)
+    !defined(CSRG_BASED) && \
+    !defined(sun)
            volatile
 #endif
            AttributeList *olias_attrs = 0;
index cd1d8999acfce7fd5d5c8e6a08eb7cefe60837c5..a326437a6f5a183cc24b46994e1b79326934bd4d 100644 (file)
@@ -141,15 +141,21 @@ BinaryOperatorNode::evaluate() const
 {
   // calculate children trees and then have feature value do the operation 
 
-#if !defined(SC3) && !defined(_IBMR2) && !defined(__uxp__) && !defined(__osf__) && !defined(USL) && !defined(linux) && !defined(CSRG_BASED)
+#if !defined(SC3) && !defined(_IBMR2) && !defined(__uxp__) && \
+    !defined(__osf__) && !defined(USL) && !defined(linux) && \
+    !defined(CSRG_BASED) && !defined(sun)
   volatile
 #endif
   FeatureValue *left =  0;
-#if !defined(SC3) && !defined(_IBMR2) && !defined(__uxp__) && !defined(__osf__) && !defined(USL) && !defined(linux) && !defined(CSRG_BASED)
+#if !defined(SC3) && !defined(_IBMR2) && !defined(__uxp__) && \
+    !defined(__osf__) && !defined(USL) && !defined(linux) && \
+    !defined(CSRG_BASED) && !defined(sun)
   volatile
 #endif
   FeatureValue *right = 0;
-#if !defined(SC3) && !defined(_IBMR2) && !defined(__uxp__) && !defined(__osf__) && !defined(USL) && !defined(linux) && !defined(CSRG_BASED)
+#if !defined(SC3) && !defined(_IBMR2) && !defined(__uxp__) && \
+    !defined(__osf__) && !defined(USL) && !defined(linux) && \
+    !defined(CSRG_BASED) && !defined(sun)
   volatile
 #endif
   FeatureValue *result = 0;
index ba6a8af1b3940dbf3850617bad55bf02a1afd9b6..8282260a828c1f7d61c3d883b838b6390940e745 100644 (file)
 class StyleSheetException : public Exception
 {
 public:
-  DECLARE_EXCEPTION(StyleSheetException, Exception);
+  DECLARE_EXCEPTION(StyleSheetException, Exception)
   virtual ~StyleSheetException();
 };
 
 class StyleSheetSyntaxError : public StyleSheetException
 {
 public:
-  DECLARE_EXCEPTION(StyleSheetSyntaxError, StyleSheetException);
+  DECLARE_EXCEPTION(StyleSheetSyntaxError, StyleSheetException)
   
 };
 
 class badEvaluationException : public StyleSheetException
 {
 public:
-  DECLARE_EXCEPTION(badEvaluationException, StyleSheetException);
+  DECLARE_EXCEPTION(badEvaluationException, StyleSheetException)
 
   virtual ~badEvaluationException();
 };
@@ -66,13 +66,13 @@ public:
 class badCastException : public StyleSheetException
 {
 public:
-  DECLARE_EXCEPTION(badCastException, StyleSheetException);
+  DECLARE_EXCEPTION(badCastException, StyleSheetException)
 };
 
 class undefinedVariableException : public badEvaluationException
 {
 public:
-  DECLARE_EXCEPTION(undefinedVariableException, badEvaluationException);
+  DECLARE_EXCEPTION(undefinedVariableException, badEvaluationException)
 
   undefinedVariableException(const Symbol &v)
     : badEvaluationException(),
@@ -87,7 +87,7 @@ private:
 class undefinedAttributeException : public badEvaluationException
 {
 public:
-  DECLARE_EXCEPTION(undefinedAttributeException, badEvaluationException);
+  DECLARE_EXCEPTION(undefinedAttributeException, badEvaluationException)
 
   undefinedAttributeException(const Symbol &a)
     : badEvaluationException(),
@@ -101,38 +101,38 @@ private:
 class docParserException : public Exception
 {
 public:
-  DECLARE_EXCEPTION(docParserException, Exception);
+  DECLARE_EXCEPTION(docParserException, Exception)
 };
 
 class unknownTagException : public docParserException
 {
 public:
-  DECLARE_EXCEPTION(unknownTagException, docParserException);
+  DECLARE_EXCEPTION(unknownTagException, docParserException)
   
 };
 
 class docParserUnexpectedCharacter : public docParserException
 {
 public:
-  DECLARE_EXCEPTION(docParserUnexpectedCharacter, docParserException);
+  DECLARE_EXCEPTION(docParserUnexpectedCharacter, docParserException)
   
 };
 class docParserUnexpectedTag : public docParserException
 {
 public:
-  DECLARE_EXCEPTION(docParserUnexpectedTag, docParserException);
+  DECLARE_EXCEPTION(docParserUnexpectedTag, docParserException)
   
 };
 class docParserUnexpectedData : public docParserException
 {
 public:
-  DECLARE_EXCEPTION(docParserUnexpectedData, docParserException);
+  DECLARE_EXCEPTION(docParserUnexpectedData, docParserException)
   
 };
 class docParserUnexpectedEof : public docParserException
 {
 public:
-  DECLARE_EXCEPTION(docParserUnexpectedEof, docParserException);
+  DECLARE_EXCEPTION(docParserUnexpectedEof, docParserException)
   
 };
 
index 686e1707b5857a236b73323c726dab15d88abd92..7b4d764dffd1806765eeed56865c2e62cab2e4ae 100644 (file)
@@ -43,7 +43,8 @@
 
 #include <stdlib.h>
 
-#if !defined(__osf__) && !defined(USL) && !defined(linux) && !defined(CSRG_BASED)
+#if !defined(__osf__) && !defined(USL) && !defined(linux) && \
+    !defined(CSRG_BASED) && !defined(sun)
 #include <osfcn.h>
 #endif
 
index 8ffd44166aed396100767074aba96ab7a6ca9e5f..ea19b01fad2f2c184617d99587e0a3428350951f 100644 (file)
@@ -43,7 +43,8 @@
 
 #include <stdlib.h>
 
-#if !defined(__osf__) && !defined(USL) && !defined(linux) && !defined(CSRG_BASED)
+#if !defined(__osf__) && !defined(USL) && !defined(linux) && \
+    !defined(CSRG_BASED) && !defined(sun)
 #include <osfcn.h>
 #endif
 
index f58f4ee16ddd35d0db93b0b1d2b58ad29f00afa0..d9926736d7ca113ed4f2f5a76696e9445512cc26 100644 (file)
@@ -23,11 +23,11 @@ XCOMM               .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LargePICTable  YES
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 XCOMM In DtMmdb we compile as C_API sources.
 DEFINES  = -DC_API
-INCLUDES = -I.. $(EXCEPTIONS_INCLUDES) -I../misc
+INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES) -I../misc
 
 SRCS = base.C info_base.C info_lib.C smart_ptr.C transaction.C utility.C
 OBJS = $(SRCS:.C=.o)
index 559a549f85521db74e1e1116642dc214c780f791..7ce234e2bdbbd34ab82a4b7037e8142fd56bb996 100644 (file)
@@ -23,11 +23,11 @@ XCOMM               .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LargePICTable  YES
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 XCOMM In DtMmdb we compile as C_API sources.
 DEFINES  = -DC_API
-INCLUDES = -I.. $(EXCEPTIONS_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES)
 
 SRCS = mmdb_btree.C 
 OBJS = $(SRCS:.C=.o)
index 5946834ca4f94f558faaaff20c88909f20395582..d60cf14c9ad3078ac76ba25d5ecf2466f491cb2a 100644 (file)
@@ -22,6 +22,7 @@ XCOMM         .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate      NO
 #define LargePICTable  YES
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES  = -DMEMMOVE
 INCLUDES = -I../ -I.
 
index a09a36dc736e20fd3cedec7106d82c982025c463..b0fdabf9bdb4a34a84021e79e2d964ad281b604c 100644 (file)
@@ -89,7 +89,8 @@ typedef unsigned int  sigset_t;
  * If your system's vsnprintf returns a char *, not an int,
  * change the 0 to a 1.
  */
-#if !defined(_AIX) && !defined(__osf__) && !defined(linux) && !defined(CSRG_BASED)
+#if !defined(_AIX) && !defined(__osf__) && !defined(linux) && \
+    !defined(CSRG_BASED) && !defined(sun)
 #define        VSPRINTF_CHARSTAR
 #endif
 
index d7453dd17f4de8027c8d900849731bd2ef0bdf47..d11d0c452634d6df455d2fac437cb7c5b2f1699a 100644 (file)
@@ -23,11 +23,11 @@ XCOMM               .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LargePICTable  YES
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 XCOMM In DtMmdb we compile as C_API sources.
 DEFINES  = -DC_API
-INCLUDES = -I.. $(EXCEPTIONS_INCLUDES) 
+INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES)
 
 NORMAL_SRCS = abs_agent.C zip.C huffman.C trie.C code.C lzss.C
 PARSER_SRCS = sgml.C ps.C
index 598f36628f182ee38486b6e32968c8ec8cfb4cd7..e7053e58cf864aaac3a55af3ba1930080955a5ef 100644 (file)
@@ -43,7 +43,7 @@
 
 #include <stdlib.h>
 
-#if defined(__osf__) || defined(linux) || defined(CSRG_BASED)
+#if defined(__osf__) || defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <unistd.h>
 #else
 #if !defined(__uxp__) && !defined(USL)
index f1069923086df43f0a5c5b63580a1c484c2347a0..6fcb99ea1b8514eeb4107157fa39f9b7a845884b 100644 (file)
@@ -43,7 +43,7 @@
 
 #include <stdlib.h>
 
-#if defined(__osf__) || defined(linux) || defined(CSRG_BASED)
+#if defined(__osf__) || defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <unistd.h>
 #else
 #if !defined(__uxp__) && !defined(USL)
index 497554c644b23505787bf0f8d2a76ababa8882dc..1113c753c3a9bd498a3be88bc81598e5c0a716d0 100644 (file)
@@ -23,11 +23,11 @@ XCOMM               .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LargePICTable  YES
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 XCOMM In DtMmdb we compile as C_API sources.
 DEFINES  = -DC_API
-INCLUDES = -I.. $(EXCEPTIONS_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES)
 
 SRCS = disk_bucket.C bucket_array.C disk_hash.C
 OBJS = $(SRCS:.C=.o)
index efcdc7c04a4c30d4c4fb4e3de017212631377387..1a6ea9df5ed000fed0a67824d4da2bf06706f284 100644 (file)
@@ -298,8 +298,8 @@ void disk_hash::caching(disk_bucket& b, data_t& w, int slot_num)
 //debug(cerr, b.bnum());
 //debug(cerr, k_vector -> count());
 
-   int k = int((long)(*k_vector)[b.bnum()]);
-   int r = int((long)(*r_vector)[b.bnum()]);
+   int kv = int((long)(*k_vector)[b.bnum()]);
+   int rv = int((long)(*r_vector)[b.bnum()]);
 
 ///////////////////////////////////////////
 // cache all keys in the bycket except w.
@@ -316,7 +316,7 @@ void disk_hash::caching(disk_bucket& b, data_t& w, int slot_num)
       if ( x ) {
          hash_vector -> insert(
                    (voidPtr)(size_t)ind,
-                   x -> slot_num(k, r, p, hash_vector -> count())
+                   x -> slot_num(kv, rv, p, hash_vector -> count())
                               );
       }
 
@@ -331,7 +331,7 @@ void disk_hash::caching(disk_bucket& b, data_t& w, int slot_num)
 ////////////////////////////////////////
    hash_vector -> insert(
          (voidPtr)(size_t)slot_num,
-         w.slot_num(k, r, p, hash_vector -> count())
+         w.slot_num(kv, rv, p, hash_vector -> count())
                         );
 }
       
@@ -373,11 +373,11 @@ Boolean disk_hash::member(data_t& w, disk_bucket*& b, int& slot_num) const
 
    b = &bucket_vector -> get_bucket(hash);
 
-   int k = int((long)(*k_vector)[b -> bnum()]);
-   int r = int((long)(*r_vector)[b -> bnum()]);
+   int kv = int((long)(*k_vector)[b -> bnum()]);
+   int rv = int((long)(*r_vector)[b -> bnum()]);
 
    slot_num = 
-     int((long)(*hash_vector)[w.slot_num(k, r, p, hash_vector -> count())]);
+     int((long)(*hash_vector)[w.slot_num(kv, rv, p, hash_vector -> count())]);
 
 //debug(cerr, slot_num);
 
index 6a846419d616c6bb61bd0aa56148aee2dba7a1b7..defe059d0c4a9f3ed57d4e401885b22373124210 100644 (file)
@@ -23,11 +23,11 @@ XCOMM               .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LargePICTable  YES
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 XCOMM In DtMmdb we compile as C_API sources.
 DEFINES  = -DC_API
-INCLUDES = -I.. $(EXCEPTIONS_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES)
 
 SRCS = set.C bset.C slist.C dlist_cell.C dlist.C heap.C \
        void_ptr_array.C void_ptr_stack.C \
index 5a149185ed2d1c4866153cf8fab9629fd98459d1..1f7f8eb236cf1c92cbfcb0f43058c090e0837f2f 100644 (file)
@@ -45,7 +45,7 @@ extern int errno;
 class ccException : public Exception
 {
 public:
-   DECLARE_EXCEPTION(ccException, Exception);
+   DECLARE_EXCEPTION(ccException, Exception)
 
    virtual ~ccException() {};
 
@@ -63,7 +63,7 @@ protected:
    char* msg;
 
 public:
-   DECLARE_EXCEPTION(ccStringException, ccException);
+   DECLARE_EXCEPTION(ccStringException, ccException)
 
    ccStringException(char const* m) : msg((char*)m) {};
    ~ccStringException() {};
@@ -80,7 +80,7 @@ protected:
    int mindex;
 
 public:
-   DECLARE_EXCEPTION(ccBoundaryException, ccException);
+   DECLARE_EXCEPTION(ccBoundaryException, ccException)
 
    ccBoundaryException(int l, int h, int i) : 
      low(l), high(h), mindex(i) {};
index 1d5497a19300f07b911390c4bf5bced5d166cd47..a1b499e98d59c43773854b6ce7fe1b4f587ff787 100644 (file)
@@ -80,7 +80,7 @@ Destructable::~Destructable()
 inline void
 Destructable::destruct()
 {
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
   delete this;
 #else
   // Have to call this here since some compilers don't allow
index e8df94901293709b9545d5658079cefed4b22da7..2ca13201c32ee46b0a295c0872fdcad6ba4b394d 100644 (file)
@@ -162,7 +162,7 @@ Exceptions::set_error_handler (error_handler_t error_handler)
 void
 Exceptions::error (const char *message, error_type_t error_type)
 {
-  unsigned int bufferlen = 100;
+  const unsigned int bufferlen = 100;
   char buffer[3][bufferlen];
   static char *lines[3] = { buffer[0], buffer[1], buffer[2] };
   int len, count = 0;
index c13a8dc4c4cad09d453107a582fd3bd96203dc2b..1d36afed2ac8ce1044346671b37c7951a003242b 100644 (file)
@@ -23,9 +23,9 @@ XCOMM         .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LargePICTable  YES
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
-#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
+#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 5
 EXCEPTION_DEFINES  = -DHAS_TERMINATE
 #endif
 
index ebcc961ac4dd75dc92fa21dd49c76996b6fed209..2017e8ff1d3513ac472e1425107b2d612c3811ed 100644 (file)
@@ -23,11 +23,11 @@ XCOMM               .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LargePICTable  YES
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 XCOMM In DtMmdb we compile as C_API sources.
 DEFINES  = -DC_API
-INCLUDES = -I.. $(EXCEPTIONS_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES)
 
 SRCS = data_t.C imp_bucket.C imp_die.C
 OBJS = $(SRCS:.C=.o)
index 6957ac1fbcf844b5c737950626d0fd8cc9ec2c90..57725099c4699d5266c715956b870ca2910122e3 100644 (file)
@@ -257,6 +257,7 @@ Boolean data_t::binaryIn(buffer& buf)
 {
    char c; buf.get(c);
    flag = (data_t::flag_type)c;
+   char* cp;
 
    unsigned int sz;
 
@@ -277,7 +278,8 @@ Boolean data_t::binaryIn(buffer& buf)
 
         break;
    }
-   buf.get(*(char*)&dt);
+   cp = (char*)&dt;
+   buf.get(*(long*)cp);
    return true;
 }
 
index 82d99ce0a84e17d48e47d9318c8742e04fdb041d..1b50d43626659817d01ad3d3afbd21248e888cd2 100644 (file)
@@ -23,11 +23,11 @@ XCOMM               .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LargePICTable  YES
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 XCOMM In DtMmdb we compile as C_API sources.
 DEFINES  = -DC_API -DPORTABLE_DB
-INCLUDES = -I.. $(EXCEPTIONS_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES)
 
 SRCS = buckets.C       mphf_funcs.C    mphf_hash_table.C \
        params.C        pattern.C       sorter.C
index e82b53f3cd041c87e670ca329d8720cceaadf9a7..0b38aaf8e7e4007dfdbf0ae03ebcf0b700cb6310 100644 (file)
@@ -23,11 +23,11 @@ XCOMM               .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LargePICTable  YES
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 XCOMM In DtMmdb we compile as C_API sources.
 DEFINES  = -DC_API -DPORTABLE_DB
-INCLUDES = -I.. $(EXCEPTIONS_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES)
 
 SRCS =         btree_index.C           dyn_disk_index.C        dyn_index.C  \
        dyn_memory_index.C      fast_mphf.C             hash.C \
index cc64dae5b8adf8366bbd8cde6daa4b4be046054b..aa205df843d436cb6648e40aa2869eb825d0358d 100644 (file)
@@ -114,7 +114,7 @@ dyn_index::_insert_loc(data_t& intKey, const oid_t& id)
 MESSAGE(cerr, "in dyn_index insert()");
 debug(cerr, intKey);
 debug(cerr, id);
-debug(cerr, pos);
+debug(cerr, p);
 */
 
     if ( v_idx_agent_ptr -> member( intKey ) == true ) {
@@ -268,12 +268,12 @@ oid_list_handler* dyn_index::get_loc_list(const handler& t)
       ) {
 //MESSAGE(cerr, "in hash table");
 
-      int pos = int(long(intKey -> dt));
-//debug(cerr, pos);
+      int p = int(long(intKey -> dt));
+//debug(cerr, p);
       delete intKey;
 //MESSAGE(cerr, "dyn_index::get_loc_list() done");
 
-      return  (*v_inv_lists_hd) -> get_list(pos); 
+      return  (*v_inv_lists_hd) -> get_list(p);
 
    } else {
 //MESSAGE(cerr, "not in hash table");
index 348473813058912e792b9132b626038bfcb1c5e9..920f88b96ffa24a62460b60bbb08b8f42840abeb 100644 (file)
@@ -119,6 +119,7 @@ public:
    Boolean init_map_tbls();
 
 // load the MPHF from files
+   using pstring::asciiIn;
    virtual io_status asciiIn(istream&);
 
 // compute a hash value for a key.
index 2de957684257746e2cada63b1c8fc66ec01d78ab..969b90aff575557dc56b2cc7aa154f2483128fec 100644 (file)
@@ -23,11 +23,11 @@ XCOMM               .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LargePICTable  YES
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 XCOMM In DtMmdb we compile as C_API sources.
 DEFINES  = -DC_API -DCOMPACTED_DISK_REP -DPORTABLE_DB
-INCLUDES = -I.. $(EXCEPTIONS_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES)
 
 SRCS = managers.C misc.C query_mgr.C template_mgr.C
 OBJS = $(SRCS:.C=.o)
index 0038c22e4f1955d5914a6c390c9323e2ca7209a7..d3ecff5d12d27ca49d9b3ad51e15e432d34a731a 100644 (file)
@@ -112,7 +112,7 @@ gethostid()
     return atoi(u.idnumber);
   abort();
 }
-#elif defined(SVR4)
+#elif defined(SVR4) && !defined(sun)
 static unsigned int
 gethostid()
 {
index b98197568e09ef3a3769c5ee41bbc4eda49e7ad5..7e8866dbbbabe754291c758835e582d7058a1525 100644 (file)
@@ -23,11 +23,11 @@ XCOMM               .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LargePICTable  YES
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 XCOMM In DtMmdb we compile as C_API sources.
 DEFINES  = -DC_API -DPORTABLE_DB
-INCLUDES = -I.. $(EXCEPTIONS_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES)
 
 SRCS = composite.C     compressed_pstring.C    cset.C \
        dl_list.C       dl_list_cell.C          handler.C \
index 2ab7d2b3d6326dead5035fbcdd8d0473b5fb4d24..d4cc1819735779004d9286bece7a565b9fe95fc5 100644 (file)
@@ -82,7 +82,8 @@ public:
 */
 
 // print function
-   virtual io_status asciiIn(istream&) ;
+   using pstring::asciiIn;
+   virtual io_status asciiIn(istream&);
 
 protected:
    chunks_index *v_str_index;
index 4d592d5b12599e618c7dd3b6b3c14083f4d72b30..e14e6783452cb05c3cbadfcdd08ee03b542eb439 100644 (file)
@@ -23,14 +23,14 @@ XCOMM               .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LargePICTable  YES
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 #ifdef DtinfoClient
 DEFINES= -DC_API -DNO_DB_LOCK -DCDE_NEXT
 #else
 DEFINES= -DC_API -DNO_DB_LOCK $(BYTE_ORDER_DEFINES)
 #endif
-INCLUDES = -I.. $(EXCEPTIONS_INCLUDES) $(COMMON_CLASS_INCLUDES) -I../misc
+INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES) $(COMMON_CLASS_INCLUDES) -I../misc
 
 BASE_SRCS =  \
        asciiIn_filters.C       collectionIterator.C \
index ffc2766a150b732b04215ed713e7cbacfb04ba0f..1b1f9d3ed7d5009699361622ad7534f2bd27d887 100644 (file)
@@ -23,11 +23,11 @@ XCOMM               .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LargePICTable  YES
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 XCOMM In DtMmdb we compile as C_API sources.
 DEFINES  = -DC_API -DPORTABLE_DB
-INCLUDES = -I.. $(EXCEPTIONS_INCLUDES) -I../misc
+INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES) -I../misc
 
 NORMAL_SRCS = desc.C store_desc.C object_dict.C \
        stored_object_desc.C index_desc.C inv_desc.C \
index 90532875156d1e0d87dbfcbb349cd508f62ed6e1..f708cf56a1fbd6e5610b3a6dc48fb4355ecb1ffc 100644 (file)
@@ -64,7 +64,7 @@ int replace_string_len;
 //extern FILE *yyin;
 
 extern int schemaparse();
-extern int schemarestart(FILE*);
+extern void schemarestart(FILE*);
 extern FILE *schemain;
 
 object_dict::object_dict() :
index 18cde82c05b10807232c3e5e2447d938d1bf1e54..eda5b736bdc53a8d0db49477d9bd1e825b1709bd 100644 (file)
@@ -43,7 +43,7 @@
 
 #include <stdlib.h>
 
-#if defined(__osf__) || defined(linux) || defined(CSRG_BASED)
+#if defined(__osf__) || defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <unistd.h>
 #else
 #if !defined(__uxp__) && !defined(USL)
index 82ea47c2ac68cb7a5afceab50666a9d45bc3212d..abee391d65c31fd9c037de818cf45a5fb2313e0a 100644 (file)
@@ -23,11 +23,11 @@ XCOMM               .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LargePICTable  YES
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 XCOMM In DtMmdb we compile as C_API sources.
 DEFINES  = -DC_API -DPORTABLE_DB
-INCLUDES = -I.. $(EXCEPTIONS_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES)
 
 SRCS = abs_storage.C   chunks_index.C  heap_comp_funcs.C \
        lru.C           page.C          page_cache.C \
index cf71ccb2f32e0cd82ae09515e86340b20e7ea476..e80036a7d959626ac283aae4a90f8294e3506ad1 100644 (file)
@@ -23,11 +23,11 @@ XCOMM               .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LargePICTable  YES
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 XCOMM In DtMmdb we compile as C_API sources.
 DEFINES  = -DC_API -DPORTABLE_DB
-INCLUDES = -I.. $(EXCEPTIONS_INCLUDES) -I../misc
+INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES) -I../misc
 
 BASE_SRCS = \
        funcs.C         ostring.C       pm_random.C     atoi_pearson.C \
index a8b7ce5129de7861e2a9fccb92209a5e795e5023..1ae79085f48ea02dbc8b9d6c059a8eac9715d8b3 100644 (file)
@@ -26,7 +26,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#if !defined(hpux) && !defined(__osf__) && !defined(USL) && !defined(linux) && !defined(CSRG_BASED)
+#if !defined(hpux) && !defined(__osf__) && !defined(USL) && \
+    !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
 #include <sysent.h>
 #endif
 
index f46a04d87370db57b68aaaede70d8d5fcb347e69..9ee88a8cec1db4b12a715ac6cace1508a59c8822 100644 (file)
 #define _funcs_h 1
 
 #if !defined(USL) && !defined(__osf__) && !defined(linux) && \
-    !defined(CSRG_BASED)
+    !defined(CSRG_BASED) && !defined(sun)
 #include <libc.h>
 #endif
 #if defined(hpux) || defined(sgi) || defined(USL) ||defined(__osf__) || \
-    defined(linux) || defined(CSRG_BASED)
+    defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <unistd.h>
 #else
 #include <sysent.h>
index e1aa01ce0db229b4c346b9f8ed09a5b7158b3cf2..f99bd77d3e1d397f6412c3f81129fdd1fe4626a9 100644 (file)
@@ -72,7 +72,7 @@ extern int errno;
 class mmdbException : public Exception
 {
 public:
-   DECLARE_EXCEPTION(mmdbException, Exception);
+   DECLARE_EXCEPTION(mmdbException, Exception)
 
    virtual ~mmdbException() {};
 
@@ -90,7 +90,7 @@ protected:
    char* msg;
 
 public:
-   DECLARE_EXCEPTION(stringException, mmdbException);
+   DECLARE_EXCEPTION(stringException, mmdbException)
 
    stringException(char const* m) : msg((char*)m) {};
    ~stringException() {};
@@ -104,7 +104,7 @@ class formatException : public stringException
 protected:
 
 public:
-   DECLARE_EXCEPTION(formatException, stringException);
+   DECLARE_EXCEPTION(formatException, stringException)
 
    formatException(char const* m) : stringException(m) {};
    ~formatException() {};
@@ -118,7 +118,7 @@ protected:
    int v_code;
 
 public:
-   DECLARE_EXCEPTION(intException, mmdbException);
+   DECLARE_EXCEPTION(intException, mmdbException)
 
    intException(int c) : v_code(c) {};
    ~intException() {};
@@ -133,7 +133,7 @@ class systemException : public intException
 {
 
 public:
-   DECLARE_EXCEPTION(systemException, intException);
+   DECLARE_EXCEPTION(systemException, intException)
 
    systemException(int c) : intException(c) {};
    ~systemException() {};
@@ -145,7 +145,7 @@ class streamException : public intException
 protected:
 
 public:
-   DECLARE_EXCEPTION(streamException, intException);
+   DECLARE_EXCEPTION(streamException, intException)
 
    streamException(int c) : intException(c) {};
    ~streamException() {};
@@ -160,7 +160,7 @@ protected:
    long mindex;
 
 public:
-   DECLARE_EXCEPTION(boundaryException, mmdbException);
+   DECLARE_EXCEPTION(boundaryException, mmdbException)
 
    boundaryException(long l, long h, long i) : 
      low(l), high(h), mindex(i) {};
@@ -173,7 +173,7 @@ public:
 class beginTransException: public mmdbException
 {
 public:
-   DECLARE_EXCEPTION(beginTransException, mmdbException);
+   DECLARE_EXCEPTION(beginTransException, mmdbException)
    beginTransException() {};
    ~beginTransException() {};
 };
@@ -181,7 +181,7 @@ public:
 class commitTransException: public mmdbException
 {
 public:
-   DECLARE_EXCEPTION(commitTransException, mmdbException);
+   DECLARE_EXCEPTION(commitTransException, mmdbException)
    commitTransException() {};
    ~commitTransException() {};
 };
@@ -189,7 +189,7 @@ public:
 class rollbackTransException: public mmdbException
 {
 public:
-   DECLARE_EXCEPTION(rollbackTransException, mmdbException);
+   DECLARE_EXCEPTION(rollbackTransException, mmdbException)
    rollbackTransException() {};
    ~rollbackTransException() {};
 };
@@ -202,7 +202,7 @@ protected:
    const char* f_name;
 
 public:
-   DECLARE_EXCEPTION(demoException, mmdbException);
+   DECLARE_EXCEPTION(demoException, mmdbException)
 
    demoException(const char* p, const char* n) : f_path(p), f_name(n) {};
    virtual ~demoException() {};
index 832087d0dfc86f714359e076fd775dcad88bbefd..1256c91f1dca628680ee923b6de6b39b61404547 100644 (file)
@@ -23,7 +23,8 @@
 /* $XConsortium: streambuf.C /main/8 1996/08/21 15:55:14 drk $ */
 #include "utility/c_streambuf.h"
 
-#if defined(USL) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
+#if defined(USL) || defined(__osf__) || defined(linux) || \
+    defined(CSRG_BASED) || defined(sun)
 #include <stdlib.h>
 #else
 #include <libc.h>
index 1adde51ede0265aabab7abacc0677d3b58537ba2..4c0bcbb0bab97ef37894a455befb3d3dfdc46463 100644 (file)
@@ -11,6 +11,7 @@ XCOMM $XConsortium: Imakefile /main/5 1996/06/11 17:45:12 cde-hal $
 
 NormalCplusplusObjectRule()
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 INCLUDES =  -I.
 
 #ifdef AIXArchitecture
index 51ec0c195e31d952281f0eb1c17471844e71a0ca..095bd718ecb765e3f0d4606f812cccf8c95f348f 100644 (file)
@@ -1,6 +1,6 @@
 XCOMM $XConsortium: Imakefile /main/8 1996/08/21 15:41:09 drk $
 
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
 
 MAKEFILEDEPS=Classlist.mk
@@ -10,11 +10,11 @@ LIBNAME=Agents
 NormalCplusplusObjectRule()
 
 #ifdef DoLicenseManagement
-INCLUDES=$(BROWSER_INCLUDES) $(MMDB_INCLUDES) $(LICENSE_L_INCLUDES)
+INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) $(MMDB_INCLUDES) $(LICENSE_L_INCLUDES)
 EXTRA_DEFINES=-DLICENSE_MANAGEMENT
 #else
 XCOMM Should remove LICENSE_L_INCLUDES from this list in this case
-INCLUDES=$(BROWSER_INCLUDES) $(COMMON_CLASS_INCLUDES)
+INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) $(COMMON_CLASS_INCLUDES)
 #endif
 #include "Classlist.mk"
 
index 1ba846d056d31ea4a4200bb1fd1c5975e6c242ee..6694fc074349f06e85283df84917b1c2ab581554 100644 (file)
@@ -30,7 +30,6 @@
 #include "UAS.hh"
 #include <X11/Intrinsic.h>
 
-class OutlineListView;
 class OutlineListView;
 class WTopLevelShell;
 class ScopeMenu;
index 0f74ef4010e8a8bf28b8669afd3adc1f6dde0f0f..beca3408c44606a5785a857aa723371783178b98 100644 (file)
@@ -199,15 +199,15 @@ static char another_g_top_locator[4096] ;
  * DtHelpDialog widget action list - required by the DisplayArea
  */
 static XtActionsRec DrawnBActions[] =
-    {
-        {(char*)"DeSelectAll"    , _DtHelpDeSelectAll    },
-        {(char*)"SelectAll"      , _DtHelpSelectAll      },
-        {(char*)"ActivateLink"   , _DtHelpActivateLink   },
-        {(char*)"CopyToClipboard", _DtHelpCopyAction     },
-        {(char*)"PageUpOrDown"   , _DtHelpPageUpOrDown   },
-        {(char*)"PageLeftOrRight", _DtHelpPageLeftOrRight},
-        {(char*)"NextLink"       , _DtHelpNextLink       }
-    };
+  {
+    {(char*)"DeSelectAll"    , (DeSelectAll_ptr)_DtHelpDeSelectAll         },
+    {(char*)"SelectAll"      , (SelectAll_ptr)_DtHelpSelectAll             },
+    {(char*)"ActivateLink"   , (ActivateLink_ptr)_DtHelpActivateLink       },
+    {(char*)"CopyToClipboard", (CopyAction_ptr)_DtHelpCopyAction           },
+    {(char*)"PageUpOrDown"   , (PageUpOrDown_ptr)_DtHelpPageUpOrDown       },
+    {(char*)"PageLeftOrRight", (PageLeftOrRight_ptr)_DtHelpPageLeftOrRight },
+    {(char*)"NextLink"       , (NextLink_ptr)_DtHelpNextLink               }
+  };
 
 //-------  Functions --------------------------------------------
 
index 4e9634464372f70d3297aed5d0639a4d9924559e..11d3bece454f661f6edc45765337a51d9f20824e 100644 (file)
 
 #include "UAS.hh"
 
+typedef void _DtHelpDeSelectAll_t(_WidgetRec*,_XEvent*,char**,unsigned*);
+typedef _DtHelpDeSelectAll_t * DeSelectAll_ptr;
+typedef void _DtHelpSelectAll_t(_WidgetRec*,_XEvent*,char**,unsigned*);
+typedef _DtHelpSelectAll_t * SelectAll_ptr;
+typedef void _DtHelpActivateLink_t(_WidgetRec*,_XEvent*,char**,unsigned*);
+typedef _DtHelpActivateLink_t * ActivateLink_ptr;
+typedef void _DtHelpCopyAction_t(_WidgetRec*,_XEvent*,char**,unsigned*);
+typedef _DtHelpCopyAction_t * CopyAction_ptr;
+typedef void _DtHelpPageUpOrDown_t(_WidgetRec*,_XEvent*,char**,unsigned*);
+typedef _DtHelpPageUpOrDown_t * PageUpOrDown_ptr;
+typedef void _DtHelpPageLeftOrRight_t(_WidgetRec*,_XEvent*,char**,unsigned*);
+typedef _DtHelpPageLeftOrRight_t * PageLeftOrRight_ptr;
+typedef void _DtHelpNextLink_t(_WidgetRec*,_XEvent*,char**,unsigned*);
+typedef _DtHelpNextLink_t * NextLink_ptr;
+
 class NodeViewInfo;
 class NodeHandle;
 class Manager;
index e114dc0985e5980ead3c526201571dd1f9ccbef9..60ad4846faece0e248f3a0a200de78fee3596ad4 100644 (file)
@@ -209,6 +209,12 @@ xList<UAS_Pointer<UAS_Common> > g_tab_list;
 
 extern AppPrintData * l_AppPrintData; 
 
+extern "C"
+{
+  typedef void (*resize_cb_ptr)();
+  typedef void (*hypertext_cb_ptr)();
+}
+
 #ifdef CV_HYPER_DEBUG
 void
 #else
@@ -1753,8 +1759,8 @@ NodeWindowAgent::create_ui()
                             FALSE,             // traversal flag
                             1,                 // rows
                             1,                 // columns
-                            (void(*)()) hypertext_cb, // hypertext cb
-                            (void(*)())resize_cb,     // resize cb
+                            (hypertext_cb_ptr) hypertext_cb, // hypertext cb
+                            (resize_cb_ptr) resize_cb,       // resize cb
                             0,                 // exec ok routine
                             this,              // client_data
                             defaultList        // default font list
index 411c02319c861957019c3561a108356a9f42d8f5..7e216fa9af26e800c0979732ad628ffdb5447691 100644 (file)
@@ -176,7 +176,7 @@ FolioObject::notify (u_int notify_type, void *notify_data)
 // /////////////////////////////////////////////////////////////////
 
 void
-#if defined(SC3) || defined(__osf__) || defined(USL)
+#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
 FolioObject::add_dependent (FolioObject *dependent, notify_handler_t handler,
 #else
 FolioObject::add_dependent (void *dependent, notify_handler_t handler,
@@ -184,7 +184,7 @@ FolioObject::add_dependent (void *dependent, notify_handler_t handler,
                            u_int notify_type, void *dependent_data)
 {
   // Adds to begining because that's easiest.
-#if defined(SC3) || defined(__osf__) || defined(USL)
+#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
   f_dependents = new Dependent (&f_dependents, f_dependents,
                                dependent, NULL, handler,
                                notify_type, dependent_data);
@@ -206,7 +206,7 @@ FolioObject::add_dependent (void *dependent, notify_handler_t handler,
   // by mistake like this.  We'll just have to cast it to a FolioObject
   // when the call through it is made and hope the compiler doesn't
   // expect it to point to an actual FolioObject (or whatever, eg: WWL). 
-#if defined(SC3) || defined(__osf__) || defined(USL)
+#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
   ON_DEBUG(printf ("@@@ adding to depend_on_list of %p\n", dependent));
   dependent->f_depend_on_list =
     new DependOnList (dependent->f_depend_on_list, f_dependents);
@@ -244,7 +244,7 @@ FolioObject::remove_depend_on (FolioObject *target, Dependent *d)
 // /////////////////////////////////////////////////////////////////
 
 void
-#if defined(SC3) || defined(__osf__) || defined(USL)
+#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
 FolioObject::remove_dependent (FolioObject *dependent,
 #else
 FolioObject::remove_dependent (void *dependent,
@@ -258,7 +258,7 @@ FolioObject::remove_dependent (void *dependent,
   // That means that each handler added must be removed!
   for (d = &f_dependents; *d != NULL; d = &((*d)->f_next))
     {
-#if defined(SC3) || defined(__osf__) || defined(USL)
+#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
       if ((*d)->f_dependent      == dependent   &&
 #else
       if ((*d)->f_dependent      == (FolioObject*)dependent   &&
@@ -272,7 +272,7 @@ FolioObject::remove_dependent (void *dependent,
          // f_folio_object will be NULL if the Dependent object was
          // created in add_dependent!  DJB 11/10/92 
          assert ((*d)->f_folio_object != NULL);
-#if defined(SC3) || defined(__osf__) || defined(USL)
+#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
          remove_depend_on (dependent, *d);
 #else
          remove_depend_on ((FolioObject*)dependent, *d);
@@ -342,7 +342,7 @@ FolioObject::release_depend_on_list()
 // by deleting that handle!!! 
 
 void
-#if defined(SC3) || defined(__osf__) || defined(USL)
+#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
 FolioObject::observe (FolioObject *real_this, FolioObject *target,
 #else
 FolioObject::observe (void *real_this, FolioObject *target,
@@ -358,7 +358,7 @@ FolioObject::observe (void *real_this, FolioObject *target,
   // ---
   // OK, instead we will have to pass in the "real" this pointer which
   // may be different from the this pointer visible in this routine. 
-#if defined(SC3) || defined(__osf__) || defined(USL)
+#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
   target->f_dependents =
     new Dependent (&target->f_dependents, target->f_dependents,
                   real_this, this,
index a5ae2a05bc285e3bc92958e451bb83a3e93ac0c7..a6d79e48fbe01a8db1ab8fc41dc8b4abc080a3fb 100644 (file)
@@ -72,7 +72,7 @@ public: // functions
 #define AddDependentd(CB, TYPE, DATA) \
   add_dependent (this, (notify_handler_t)CB, TYPE, DATA)
 
-#if defined(SC3) || defined(__osf__) || defined(USL)
+#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
   void add_dependent (FolioObject *dependent, notify_handler_t handler,
                      u_int notify_type, void *dependent_data = NULL);
 #else
@@ -85,7 +85,7 @@ public: // functions
 #define RemoveDependentd(CB, TYPE, DATA) \
   remove_dependent(this, (notify_handler_t)CB, TYPE, DATA)
 
-#if defined(SC3) || defined(__osf__) || defined(USL)
+#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
   void remove_dependent (FolioObject *dependent, notify_handler_t handler,
                         u_int notify_type, void *dependent_data = NULL);
 #else
@@ -101,7 +101,7 @@ public: // functions
 #define Observed(TARG, TYPE, CB, DATA) \
   observe (this, TARG, (notify_handler_t) CB, TYPE, DATA)
 
-#if defined(SC3) || defined(__osf__) || defined(USL)
+#if defined(SC3) || defined(__osf__) || defined(USL) || defined(__SunOS)
   void observe (FolioObject *real_this, FolioObject *target,
                notify_handler_t callback, u_int notify_type,
                void *client_data = NULL);
index f48bac8ac4093735893d369723fb5d2f52c4cd69..f73a89dfdcd5456f07bbd95d8b91c752a5a71671 100644 (file)
@@ -56,6 +56,7 @@ public: // functions
     // NOTE: remove 3rd param after testing
     : List (10, 10, List::GROW_ADD) { };
   int find (FolioObject &);
+  using List::remove;
   void remove (FolioObject &);
 };
 
index c86cbe9ffa3f6e6b1c46798f4876ca9ff2a9d0f9..09aa879988a288aa2f638f598683b28a000941a9 100644 (file)
@@ -1,6 +1,6 @@
 XCOMM $XConsortium: Imakefile /main/6 1996/08/21 15:41:35 drk $
 
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
 
 MAKEFILEDEPS=Classlist.mk
@@ -10,9 +10,9 @@ LIBNAME=Basic
 NormalCplusplusObjectRule()
 
 #if defined(UseWideChars) && defined(SunArchitecture) && (OSMajorVersion == 4)
-INCLUDES=$(BROWSER_INCLUDES) $(MMDB_INCLUDES) -I/VOB/olias/library/Xwchar/src -I/VOB/olias/library/binstall/include
+INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) $(MMDB_INCLUDES) -I/VOB/olias/library/Xwchar/src -I/VOB/olias/library/binstall/include
 #else
-INCLUDES=$(BROWSER_INCLUDES) $(COMMON_CLASS_INCLUDES) -I/VOB/olias/library/binstall/include
+INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) $(COMMON_CLASS_INCLUDES) -I/VOB/olias/library/binstall/include
 #endif
 
 #include "Classlist.mk"
index 5fc3fbfb07f97e42fb9e7d983bedb6a4f8e998dc..e512d3e134e529884ee2f844c0f4f2dd4375d77b 100644 (file)
@@ -1,6 +1,6 @@
 XCOMM $XConsortium: Imakefile /main/5 1996/08/21 15:41:55 drk $
 
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
 
 MAKEFILEDEPS=Classlist.mk
@@ -9,7 +9,7 @@ LIBNAME=Graphics
 
 NormalCplusplusObjectRule()
 
-INCLUDES=$(BROWSER_INCLUDES) $(MMDB_INCLUDES)
+INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) $(MMDB_INCLUDES)
 
 #ifdef DoLicenseManagement
 EXTRA_DEFINES=-DLICENSE_MANAGEMENT
index 4434d38a30147d2c61ec5ba92d96d78990e1a8da..642ab7522c856d69c05d8665a6b2f1f1338d6dfb 100644 (file)
@@ -1,6 +1,6 @@
 XCOMM $TOG: Imakefile /main/48 1998/08/10 15:52:48 mgreess $
 
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
 
 PROGRAM_NAME=dtinfo
@@ -50,7 +50,7 @@ SYS_LIBRARIES=-lm -L$(XPROJECTROOT)/lib -L$(MPROJECTROOT)/lib
 SYS_LIBRARIES=-lm
 #endif
 
-INCLUDES = -I. $(BROWSER_INCLUDES) $(MMDB_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) -I. $(BROWSER_INCLUDES) $(MMDB_INCLUDES)
 
 OLIASNORMALLIBS= \
            Agents/libAgents.a \
@@ -67,7 +67,7 @@ OLIASNORMALLIBS= \
            OliasSearch/libOliasSearch.a \
            Widgets/libWidgets.a \
           cgm/libcgm.a
-#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
+#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 5
 OLIASTLIBS= \
           Agents/libAgentsT.a \
           Basic/libBasicT.a \
@@ -89,7 +89,7 @@ DLLIB=-ldl
 
 OTHEROBJS=Support/InputNotifier.o
 
-#if defined(SunArchitecture) && (CplusplusCompilerMajorVersion > 3)
+#if defined(SunArchitecture) && (CplusplusCompilerMajorVersion > 5)
   MMDBTEMPLATES=$(OLIAS)/mmdb/libMMDBTemplates.a
   UAS_TEMPLATES=UAS/Base/libBaseT.a \
                 UAS/DtSR/libDtSRT.a \
@@ -257,7 +257,7 @@ DTI_CC_OBJS = \
        $(MMDB_DIR)/dti_cc/CC_String.o          $(MMDB_DIR)/dti_cc/CC_Tokenizer.o \
        $(MMDB_DIR)/dti_cc/CC_Stack.o           $(MMDB_DIR)/dti_cc/CC_Slist.o
 
-#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion != 4)
+#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion < 4)
 EXTRA_HARDCOPY_OBJS = $(MMDB_DIR)/HardCopy/TemplatesAutoNumber.o
 #endif
 
@@ -266,7 +266,7 @@ HARDCOPY_OBJS = \
        $(MMDB_DIR)/HardCopy/autoNumber.o               $(MMDB_DIR)/HardCopy/autoNumberFP.o \
        $(EXTRA_HARDCOPY_OBJS)
 
-#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion != 4)
+#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion < 4)
 EXTRA_STYLESHEET_OBJS = $(MMDB_DIR)/StyleSheet/SSTemplates.o
 #endif
 
@@ -313,7 +313,10 @@ all:: Prelude.h dfiles messages Dtinfo
 
 includes:: Prelude.h dfiles messages
 
-#if defined(HPArchitecture) ||defined (AIXArchitecture) || defined(UXPArchitecture) || (defined(SunArchitecture) && CplusplusCompilerMajorVersion < 4) || defined(AlphaArchitecture) || defined(USLArchitecture) || defined(BSDArchitecture)
+#if defined(HPArchitecture) ||defined (AIXArchitecture) || \
+    defined(UXPArchitecture) || defined(AlphaArchitecture) || \
+    (defined(SunArchitecture) && CplusplusCompilerMajorVersion < 6) || \
+    defined(USLArchitecture) || defined(BSDArchitecture)
 # ifndef Dont_Use_Templates_Repository
 #  define Dont_Use_Templates_Repository
 UAS_INCLUDES=-I./UAS/Base
@@ -338,7 +341,8 @@ SpecialCPlusPlusObjectRule(Templates.o,,-ptf $(SUBDIR_TEMPL_INCLUDES))
 SpecialCPlusPlusExpandRule(Templates..c,,-ptf -DMakeOperatorNewPublic)
 #elif defined(DoLicenseManagement)
 SpecialCPlusPlusObjectRule(Templates.o,,-ptf $(LICENSE_L_INCLUDES))
-#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
+#elif defined(LinuxArchitecture) || defined(BSDArchitecture) || \
+      defined(SunArchitecture)
 SpecialCPlusPlusObjectRule(Templates.o,,$(SUBDIR_TEMPL_INCLUDES))
 SpecialCPlusPlusExpandRule(Templates..c,,-DMakeOperatorNewPublic)
 #else
@@ -358,7 +362,7 @@ makelib(Preferences)
 makelibT(Managers)
 makelib(Other)
 makelibT(Agents)
-#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
+#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 5
 makelibsubsubdir(UAS,Base)
 makelibsubsubdir(UAS,DtSR)
 makelibsubsubdir(UAS,MMDB)
@@ -370,7 +374,7 @@ makelibT(Marks)
 makelibT(OnlineRender)
 makelibT(OliasSearch)
 makelib(cgm)
-#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
+#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 5
 makelibTsubsubdir(UAS,Base)
 makelibTsubsubdir(UAS,DtSR)
 makelibTsubsubdir(UAS,MMDB)
index 38650b6a3880ef030f7991649f5553d18cd27dbf..287df9501b02092630974c36732b8fc013bea5ae 100644 (file)
@@ -1,7 +1,7 @@
 XCOMM $XConsortium: Imakefile /main/9 1996/08/21 15:42:26 drk $
 
 XCOMM NodeMgr.o and PrintMgr.o need STYLE_SHEET_INCLUDES.
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES) $(STYLE_SHEET_INCLUDES)
+DEPEND_DEFINES = $(DEPENDDEFINES) $(STYLE_SHEET_INCLUDES)
 CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
 
 DEFINES=-DCDE_NEXT $(BYTE_ORDER_DEFINES)
@@ -23,7 +23,7 @@ LIBNAME=Managers
 
 NormalCplusplusObjectRule()
 
-INCLUDES=$(BROWSER_INCLUDES) $(COMMON_CLASS_INCLUDES)
+INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) $(COMMON_CLASS_INCLUDES)
 
 #include "Classlist.mk"
 
index a9b6a6e6ddb8aca070754e7b7939d542acd0198c..ed51955d1071422cff9c939740fd6954d0090c44 100644 (file)
@@ -1,6 +1,6 @@
 XCOMM $XConsortium: Imakefile /main/6 1996/08/21 15:42:50 drk $
 
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
 
 NormalCplusplusObjectRule()
@@ -10,7 +10,7 @@ MAKEFILEDEPS=Classlist.mk
 LIBNAME=Marks
 
 
-INCLUDES=-I.. $(EXCEPTIONS_INCLUDES) $(MMDB_INCLUDES) $(UAS_INCLUDES)
+INCLUDES=$(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES) $(MMDB_INCLUDES) $(UAS_INCLUDES)
 DEFINES=$(BYTE_ORDER_DEFINES)
 
 #include "Classlist.mk"
index 929e65a269332e57a56d1a14f9b0f91ebf29cf81..33436735a8e625769eb3d548a259b8ebb7395d24 100644 (file)
@@ -1,5 +1,6 @@
 XCOMM $XConsortium: Imakefile /main/4 1996/08/21 15:42:57 drk $
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
 
 MAKEFILEDEPS=Classlist.mk
@@ -7,7 +8,7 @@ LIBNAME=OliasSearch
 
 NormalCplusplusObjectRule()
 
-INCLUDES=$(BROWSER_INCLUDES)
+INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES)
 
 #include "Classlist.mk"
 
index 467fcb49e03fb5faae1aa9b0a8ce842ac61062ef..6cf197242c1dbfd28e49f14ff634d25e8d8d8348 100644 (file)
@@ -1,13 +1,13 @@
 XCOMM $XConsortium: Imakefile /main/8 1996/08/21 15:43:09 drk $
 
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
 
 LIBNAME=OnlineRender
 
 NormalCplusplusObjectRule()
 
-INCLUDES=$(BROWSER_INCLUDES) $(MMDB_INCLUDES) $(STYLE_SHEET_INCLUDES) \
+INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) $(MMDB_INCLUDES) $(STYLE_SHEET_INCLUDES) \
 $(COMMON_CLASS_INCLUDES) 
 DEFINES=-DCDE_NEXT
 
index 3d536330cea45798721440dc76b5efdb3a3432f4..36bf44dcd377d1169f629cda2360cda071a651bc 100644 (file)
@@ -1,6 +1,6 @@
 XCOMM $XConsortium: Imakefile /main/8 1996/08/21 15:43:18 drk $
 
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 CDEBUGFLAGS=-g
 
@@ -10,7 +10,7 @@ LIBNAME=Other
 
 NormalCplusplusObjectRule()
 
-INCLUDES = $(BROWSER_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES)
 
 #include "Classlist.mk"
 
index 802229e36e01fdaf179822a647e40eb1d7dd5052..b12d99ff8a869fe5ca0c80d80eea0c8a45547fa6 100644 (file)
@@ -206,15 +206,15 @@ NULL
 
 
 static XtActionsRec DrawnBActions[] =
-    {
-        {(char*)"DeSelectAll"    , _DtHelpDeSelectAll    },
-        {(char*)"SelectAll"      , _DtHelpSelectAll      },
-        {(char*)"ActivateLink"   , _DtHelpActivateLink   },
-        {(char*)"CopyToClipboard", _DtHelpCopyAction     },
-        {(char*)"PageUpOrDown"   , _DtHelpPageUpOrDown   },
-        {(char*)"PageLeftOrRight", _DtHelpPageLeftOrRight},
-        {(char*)"NextLink"       , _DtHelpNextLink       }
-    };
+  {
+    {(char*)"DeSelectAll"    , (DeSelectAll_ptr)_DtHelpDeSelectAll         },
+    {(char*)"SelectAll"      , (SelectAll_ptr)_DtHelpSelectAll             },
+    {(char*)"ActivateLink"   , (ActivateLink_ptr)_DtHelpActivateLink       },
+    {(char*)"CopyToClipboard", (CopyAction_ptr)_DtHelpCopyAction           },
+    {(char*)"PageUpOrDown"   , (PageUpOrDown_ptr)_DtHelpPageUpOrDown       },
+    {(char*)"PageLeftOrRight", (PageLeftOrRight_ptr)_DtHelpPageLeftOrRight },
+    {(char*)"NextLink"       , (NextLink_ptr)_DtHelpNextLink               }
+  };
 
 
 
@@ -268,10 +268,11 @@ WindowSystem::WindowSystem (int &argc, char *argv[])
   bool debugging = get_boolean_app_resource("debug");
   if (!debugging)
     {
-      signal (SIGABRT, /*DWC IBM (SIG_PF)*/ core_dump_handler);
-      signal (SIGBUS, /*(SIG_PF)*/ core_dump_handler);
-      signal (SIGSEGV, /*(SIG_PF)*/ core_dump_handler);
-      signal (SIGINT, interrupt_handler);
+      signal (SIGABRT,
+              /*DWC IBM (SIG_PF)*/ (core_dump_handler_ptr)core_dump_handler);
+      signal (SIGBUS, /*(SIG_PF)*/ (core_dump_handler_ptr)core_dump_handler);
+      signal (SIGSEGV, /*(SIG_PF)*/ (core_dump_handler_ptr)core_dump_handler);
+      signal (SIGINT, (interrupt_handler_ptr)interrupt_handler);
     }
 
   /* Reference the scale widget so Veritas Replay Xt lib can link. */
@@ -553,7 +554,7 @@ WindowSystem::init()
   XSynchronize(f_display, True);
 #endif
   XSync(f_display, False);
-  XSetErrorHandler(xevent_error_aborter);
+  XSetErrorHandler((xevent_error_aborter_ptr)xevent_error_aborter);
 
 #if 0
   XtAppSetFallbackResources(f_application_context, fallbacks);
@@ -620,7 +621,8 @@ WindowSystem::init()
              parentCvtArg, XtNumber (parentCvtArg), XtCacheNone, NULL);
 #endif /* XmVersion < 1002 */
 
-  XtAddConverter (XtRString, XtRGravity, XmuCvtStringToGravity, NULL, 0);
+  XtAddConverter (XtRString, XtRGravity,
+                  (XmuCvtStringToGravity_ptr)XmuCvtStringToGravity, NULL, 0);
 
 #if XmVersion >= 1002
   XmRepTypeInstallTearOffModelConverter();
@@ -1592,6 +1594,6 @@ WindowSystem::interrupt_handler (int /* signal_number */)
   }
 
 #if defined(SVR4) || defined(hpux) || defined(_IBMR2)
-  signal (SIGINT, interrupt_handler);
+  signal (SIGINT, (interrupt_handler_ptr)interrupt_handler);
 #endif
 }
index 1df671d31567fb272f085e9bd77ee0eff963ba49..192b2b6885b0de74bb8ce588b79cea125365ae78 100644 (file)
@@ -41,6 +41,33 @@ typedef struct _VideoShell
     Boolean silent;
 } VideoShell;
 
+typedef void _DtHelpDeSelectAll_t(_WidgetRec*,_XEvent*,char**,unsigned*);
+typedef _DtHelpDeSelectAll_t * DeSelectAll_ptr;
+typedef void _DtHelpSelectAll_t(_WidgetRec*,_XEvent*,char**,unsigned*);
+typedef _DtHelpSelectAll_t * SelectAll_ptr;
+typedef void _DtHelpActivateLink_t(_WidgetRec*,_XEvent*,char**,unsigned*);
+typedef _DtHelpActivateLink_t * ActivateLink_ptr;
+typedef void _DtHelpCopyAction_t(_WidgetRec*,_XEvent*,char**,unsigned*);
+typedef _DtHelpCopyAction_t * CopyAction_ptr;
+typedef void _DtHelpPageUpOrDown_t(_WidgetRec*,_XEvent*,char**,unsigned*);
+typedef _DtHelpPageUpOrDown_t * PageUpOrDown_ptr;
+typedef void _DtHelpPageLeftOrRight_t(_WidgetRec*,_XEvent*,char**,unsigned*);
+typedef _DtHelpPageLeftOrRight_t * PageLeftOrRight_ptr;
+typedef void _DtHelpNextLink_t(_WidgetRec*,_XEvent*,char**,unsigned*);
+typedef _DtHelpNextLink_t * NextLink_ptr;
+typedef void XmuCvtStringToGravity_t(XrmValue*,unsigned*,XrmValue*,XrmValue*);
+typedef XmuCvtStringToGravity_t * XmuCvtStringToGravity_ptr;
+
+extern "C"
+{
+  typedef void core_dump_handler_t(int signal_number);
+  typedef core_dump_handler_t * core_dump_handler_ptr;
+  typedef void interrupt_handler_t(int signal_number);
+  typedef interrupt_handler_t * interrupt_handler_ptr;
+  typedef int xevent_error_aborter_t(Display *display,XErrorEvent* error_event);
+  typedef xevent_error_aborter_t * xevent_error_aborter_ptr;
+}
+
 class WindowGeometry;
 
 class WindowSystem : public WWL, public FolioObject
index ee54e404092b4b7ea0a2060fe5f4891b447bdff9..d92bff2e7fd153ed2492fa80ac082240dd01db41 100644 (file)
@@ -1,7 +1,7 @@
 XCOMM $XConsortium: Imakefile /main/6 1996/08/21 15:43:25 drk $
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 MAKEFILEDEPS=Classlist.mk
 
@@ -9,7 +9,7 @@ LIBNAME=Preferences
 
 NormalCplusplusObjectRule()
 
-INCLUDES=$(BROWSER_INCLUDES)
+INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES)
 
 
 #include "Classlist.mk"
@@ -18,7 +18,9 @@ OBJS=$(SRCS:.C=.o)
 
 make_libfiles($(LIBNAME), $(CLASSES))
 
-#if defined(LinuxArchitecture) || defined(BSDArchitecture)
+#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
+SimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR))
+#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
 SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
 #else
 SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
index 1072b71f0d17ab8a58728cb75a2a482333d74673..b609d15d2df7ceca36f6b064ec49d5be8b6b3783 100644 (file)
@@ -63,7 +63,8 @@
 #include <ctype.h>
 #include <stdio.h>
 #include <unistd.h>
-#if !defined(hpux) && !defined(__osf__) && !defined(USL) && !defined(linux) && !defined(CSRG_BASED)
+#if !defined(hpux) && !defined(__osf__) && !defined(USL) && \
+    !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
 #include <sysent.h>
 #endif
 #include <sys/types.h>
index 6699adf7bf8f95e00dbbe976316d2635f10466c8..a9fedbd3b3885774496bd4c6698c455993488452 100644 (file)
@@ -1,6 +1,6 @@
 XCOMM $XConsortium: Imakefile /main/7 1996/08/21 15:43:32 drk $
 
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
 
 MAKEFILEDEPS=Classlist.mk
@@ -9,7 +9,7 @@ LIBNAME=Query
 
 NormalCplusplusObjectRule()
 
-INCLUDES=$(BROWSER_INCLUDES) $(COMMON_CLASS_INCLUDES)
+INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) $(COMMON_CLASS_INCLUDES)
 
 #include "Classlist.mk"
 
index b0f5fce90dc62348f53aad1561c7cd1b0da2835a..85f22cba025d5e8c93dec0054fee53c53840bd12 100644 (file)
@@ -1,6 +1,6 @@
 XCOMM $XConsortium: Imakefile /main/5 1996/08/21 15:43:45 drk $
 
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
 
 MAKEFILEDEPS=Classlist.mk
@@ -10,7 +10,7 @@ LIBDIR=../lib
 
 NormalCplusplusObjectRule()
 
-INCLUDES=-I.. $(EXCEPTIONS_INCLUDES) $(UAS_INCLUDES)
+INCLUDES=$(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES) $(UAS_INCLUDES)
 
 #include "Classlist.mk"
 
index 1acea26c352819e2da78a085de7174b030e968ae..a54742a23c192f5fe7728732cdea474aa4a7854e 100644 (file)
@@ -49,7 +49,8 @@ private:
 };
 
 template <class T>
-#if defined(__uxp__) || defined(_IBMR2) || defined(__osf__) || defined(USL) || defined(linux) || defined(CSRG_BASED)
+#if defined(__uxp__) || defined(_IBMR2) || defined(__osf__) || \
+    defined(USL) || defined(linux) || defined(CSRG_BASED) || defined(sun)
 class xList : public List_base
 #else
 class xList : private List_base
@@ -60,7 +61,8 @@ class xList : private List_base
 #ifdef SC3
 friend class List_Iterator<T>;
 #else
-#if !defined(_IBMR2) && !defined(__osf__) && !defined(USL) && !defined(linux) && !defined(CSRG_BASED)
+#if !defined(_IBMR2) && !defined(__osf__) && !defined(USL) && \
+    !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
 template <class T> friend class List_Iterator;
 #endif
 #endif
@@ -96,7 +98,8 @@ public:
 
 
 template <class T>
-#if defined(_IBMR2) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
+#if defined(_IBMR2) || defined(__osf__) || defined(linux) || \
+    defined(CSRG_BASED) || defined(sun)
 class List_Iterator : public List_Iterator_base
 #else
 class List_Iterator : private List_Iterator_base
index f66be8d5b4402c2af9919df673d5ea1daa390c04..ccf18ab702525e3b56d23bd9d2af54887614e195 100644 (file)
@@ -1,6 +1,6 @@
 XCOMM $XConsortium: Imakefile /main/7 1996/08/21 15:44:17 drk $
 
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
 
 MAKEFILEDEPS=Classlist.mk
@@ -10,7 +10,7 @@ LIBDIR=../lib
 
 NormalCplusplusObjectRule()
 
-INCLUDES=-I. -I.. -I../.. -I../Support $(EXCEPTIONS_INCLUDES) $(COMMON_CLASS_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) -I. -I.. -I../.. -I../Support $(EXCEPTIONS_INCLUDES) $(COMMON_CLASS_INCLUDES)
 
 make_libfiles($(LIBNAME),)
 
index d597d9422afd74cb93c13a226fb878d570e1279e..d369aab05d98065c301bcfbc245b2f88cf908db3 100644 (file)
@@ -11,7 +11,7 @@ class UAS_Exception: public Exception {
     protected:
        UAS_String fMessage;
     public:
-       DECLARE_EXCEPTION(UAS_Exception, Exception);
+       DECLARE_EXCEPTION(UAS_Exception, Exception)
        UAS_Exception(const UAS_String&m): fMessage(m) {}
        virtual ~UAS_Exception() {}
        const UAS_String & message () const { return fMessage; }
index 34d077565fdbe5bf42deee8a66067afcb4df156b..f2a12b36840a42b5ae0410d71ad5ff7229f66b98 100644 (file)
@@ -13,7 +13,7 @@
 class UAS_OQLParser_Exception : public UAS_Exception
 {
   public:
-    DECLARE_EXCEPTION(UAS_OQLParser_Exception, Exception);
+    DECLARE_EXCEPTION(UAS_OQLParser_Exception, Exception)
 
     UAS_OQLParser_Exception(const UAS_String &m) : UAS_Exception(m) {};
     virtual ~UAS_OQLParser_Exception() {};
@@ -22,7 +22,7 @@ class UAS_OQLParser_Exception : public UAS_Exception
 class UAS_Search_Feature_Unavailable : public UAS_OQLParser_Exception
 {
   public:
-    DECLARE_EXCEPTION(UAS_Search_Feature_Unavailable, Exception);
+    DECLARE_EXCEPTION(UAS_Search_Feature_Unavailable, Exception)
 
     UAS_Search_Feature_Unavailable(const UAS_String &m) :
                                        UAS_OQLParser_Exception(m) {};
index 7f9c548e7ae5b0d48532c6fa3b99c2793b377fa4..e9f887de1efda102cf814662be8132b9526344a6 100644 (file)
@@ -1,6 +1,6 @@
 XCOMM $XConsortium: Imakefile /main/8 1996/08/21 15:44:56 drk $
 
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
 
 MAKEFILEDEPS=Classlist.mk
@@ -15,7 +15,7 @@ DEFINES=-DCDE_NEXT
 
 NormalCplusplusObjectRule()
 
-INCLUDES=-I../.. $(EXCEPTIONS_INCLUDES) $(UAS_INCLUDES) $(DTSEARCH_INCLUDES) $(UTIL_CLASSES_INCLUDES) $(COMMON_CLASS_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) -I../.. $(EXCEPTIONS_INCLUDES) $(UAS_INCLUDES) $(DTSEARCH_INCLUDES) $(UTIL_CLASSES_INCLUDES) $(COMMON_CLASS_INCLUDES)
 
 #include "Classlist.mk"
 
index 9df31c4e37941c9adb7545825ff231901454aaa6..68e7105afbbd5e313e86b68288ba4b430ff46181 100644 (file)
@@ -1,6 +1,6 @@
 XCOMM $XConsortium: Imakefile /main/9 1996/08/21 15:45:19 drk $
 
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
 
 MAKEFILEDEPS=Classlist.mk
@@ -17,7 +17,7 @@ SEARCHENG_INCLUDES=$(FULCRUM_INCLUDES)
 SEARCHENG_DEFINES=$(FULCRUM_DEFINES)
 #endif
 
-INCLUDES=-I. -I../Base -I../.. $(EXCEPTIONS_INCLUDES) $(COMMON_CLASS_INCLUDES) $(SEARCHENG_INCLUDES) $(SEARCHENG_DEFINES)
+INCLUDES = $(CXXDEPENDINCLUDES) -I. -I../Base -I../.. $(EXCEPTIONS_INCLUDES) $(COMMON_CLASS_INCLUDES) $(SEARCHENG_INCLUDES) $(SEARCHENG_DEFINES)
 
 make_libfiles($(LIBNAME),)
 
index 593c3b1cc740b9285ab70da59f9fe0ffc2b6cddf..53a20029bcb972d164ddcd0225334d4e0d5cc3a2 100644 (file)
@@ -1,6 +1,6 @@
 XCOMM $XConsortium: Imakefile /main/6 1996/08/21 15:45:28 drk $
 
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 LIBNAME= Widgets
 LIBDIR = ../lib
@@ -26,9 +26,11 @@ OBJS = $(OBJS1) $(OBJS2)
 NormalCplusplusObjectRule()
 NormalLibraryObjectRule()
 
-INCLUDES=$(CDEINCLUDES) $(WWL_INCLUDES) $(EXCEPTIONS_INCLUDES)
+INCLUDES=$(CXXDEPENDINCLUDES) $(CDEINCLUDES) $(WWL_INCLUDES) $(EXCEPTIONS_INCLUDES)
 
-#if defined(LinuxArchitecture) || defined(BSDArchitecture)
+#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
+SimpleLibraryT($(LIBNAME), $(OBJS), $(LIBDIR))
+#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
 SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
 #else
 SimpleLibrary($(LIBNAME), $(OBJS), $(LIBDIR))
index 93f7f3e53cbe11d0ae52a624005c0a76e98a42d8..5758a04bbe213f1201965563f97f6480d5d54dd3 100644 (file)
@@ -45,7 +45,7 @@
 #define WArgList_h
 
 // Allow setting of resources by name in arg list
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #define CASTRNAM (char*)
 #define CASTVAL  (void*)(size_t)
 #else
index 6b39fd464e34370a9d6b87675493b26e774e487d..f830a00622adc50b93a92ae52d38d77a4d0c74c6 100644 (file)
@@ -69,7 +69,7 @@ inline        XmTextSource    GetSource () const { return XmTextGetSource (widget); }
 inline char*   GetString () const { return XmTextGetString (widget); }
 inline XmTextPosition  GetTopCharacter () const { return XmTextGetTopCharacter (widget); }
 inline void    Insert (XmTextPosition position, char* value) const { XmTextInsert (widget, position, value); }
-inline Boolean Paste (Widget widget) const { return XmTextPaste (widget); }
+inline Boolean Paste (Widget twidget) const { return XmTextPaste (twidget); }
 inline Boolean  PosToXY (XmTextPosition position, Position* x, Position* y) const { return XmTextPosToXY (widget, position, x, y); }
 inline Boolean Remove () const { return XmTextRemove (widget); }
 inline void    Replace (XmTextPosition from, XmTextPosition to, char* s) const { XmTextReplace (widget, from, to, s); }
index 64bddc55e28df9175be9aa0165013621afc7df6a..96e64b8ac5957059923ea5921409b9283dd22793 100644 (file)
@@ -64,7 +64,7 @@ inline        char*   GetSelection () const { return XmTextFieldGetSelection (widget); }
 inline Boolean GetSelectionPosition (XmTextPosition* left, XmTextPosition* right) const { return XmTextFieldGetSelectionPosition (widget, left, right); }
 inline char*   GetString () const { return XmTextFieldGetString (widget); }
 inline void    Insert (XmTextPosition position, char* value) const { XmTextFieldInsert (widget, position, value); }
-inline Boolean Paste (Widget widget) const { return XmTextFieldPaste (widget); }
+inline Boolean Paste (Widget twidget) const { return XmTextFieldPaste (twidget); }
 inline Boolean  PosToXY (XmTextPosition position, Position* x, Position* y) const { return XmTextFieldPosToXY (widget, position, x, y); }
 inline Boolean Remove () const { return XmTextFieldRemove (widget); }
 inline void    Replace (XmTextPosition from, XmTextPosition to, char* s) const { XmTextFieldReplace (widget, from, to, s); }
index c78668fa3ffc295637c818ddafe6ecba09dbe87d..7808fcc7ffa3dac7a1ce47b9926c5bbf4335030a 100644 (file)
@@ -52,7 +52,7 @@
 // /__   \/     F-91405 ORSAY Cedex                   +33 (1) 69 41 66 29
 
 #include <X11/Intrinsic.h>
-#if !defined(linux) && !defined(CSRG_BASED)
+#if !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
 #include <generic.h>
 #else
 #define name2(__n1,__n2)       __paste2(__n1,__n2)
@@ -78,7 +78,7 @@ class WComposite;
  typedef void  (* XtProc)();
 #endif
 
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #define CASTRNAM (char*)
 #define CASTVAL  (void*)(size_t)
 #else
index f9ed1a7132475106caf7655d3112b61f54b2b654..8fb04db34f3476c9666ed6eadda73dacf26442aa 100644 (file)
@@ -54,7 +54,8 @@
 
 #include <stdlib.h>
 
-#if !defined(__osf__) && !defined(USL) && !defined(linux) && !defined(CSRG_BASED)
+#if !defined(__osf__) && !defined(USL) && !defined(linux) && \
+    !defined(CSRG_BASED) && !defined(sun)
 #include <osfcn.h>
 #endif
 
index 1a34d70e9df2bd8478c1894d50bc5d5c984f4673..fc003939fa17f8cde1035ffcfbef19f410080841 100644 (file)
@@ -45,7 +45,7 @@ public:
   const char *msg(void) const { return f_msg; };
   int error_no(void) const { return f_errno; };
   
-  DECLARE_EXCEPTION(PosixError, Exception);
+  DECLARE_EXCEPTION(PosixError, Exception)
   
 private:
   char f_msg[MAXMSG+1];
index cfb5edc926824ee7dabe5b2994ce8e48a7f29652..ab5fb0efc22854e3130190ff0a4042d6d563134d 100644 (file)
@@ -1,6 +1,6 @@
 XCOMM $TOG: Imakefile /main/27 1997/09/05 11:29:30 samborn $
 
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 CXXEXTRA_INCLUDES = -DEXPAND_TEMPLATES
 
 NormalCplusplusObjectRule()
@@ -22,7 +22,7 @@ INCLUDES=-I/VOB/olias/control/rogue
 ROGUE_LIBS=$(RW_LIBDIR) $(RW_LIB)
 #endif
 
-INCLUDES=$(MMDB_INCLUDES) $(EXCEPTIONS_INCLUDES) \
+INCLUDES=$(CXXDEPENDINCLUDES) $(MMDB_INCLUDES) $(EXCEPTIONS_INCLUDES) \
          $(MISC_INCLUDES) $(GLOBAL_INCLUDES) $(DBUG_INCLUDES) \
         $(COMMON_CLASS_INCLUDES) $(LIC_INCLUDES)
 
@@ -158,7 +158,7 @@ DTI_CC_OBJS = \
        $(MMDB_DIR)/dti_cc/CC_String.o          $(MMDB_DIR)/dti_cc/CC_Tokenizer.o \
        $(MMDB_DIR)/dti_cc/CC_Stack.o           $(MMDB_DIR)/dti_cc/CC_Slist.o
 
-#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion != 4)
+#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion < 4)
 EXTRA_HARDCOPY_OBJS = $(MMDB_DIR)/HardCopy/TemplatesAutoNumber.o
 #endif
 
@@ -167,7 +167,7 @@ HARDCOPY_OBJS = \
        $(MMDB_DIR)/HardCopy/autoNumber.o               $(MMDB_DIR)/HardCopy/autoNumberFP.o \
        $(EXTRA_HARDCOPY_OBJS)
 
-#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion != 4)
+#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion < 4)
 EXTRA_STYLESHEET_OBJS = $(MMDB_DIR)/StyleSheet/SSTemplates.o
 #endif
 
@@ -283,14 +283,15 @@ CMD_OBJS = $(CMD_SRCS:.C=.o)
 XCOMM #######################################
 XCOMM Template handling
 XCOMM #######################################
-#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
+#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 5
 all::$(CMD_OBJS)
 SimpleLibraryT(OLAFParse,$(OBJS),$(LIBDIR))
 SimpleCPlusPlusProgram(NodeParser, NodeParser.o libOLAFParse.a libOLAFParseT.a,$(Libs))
 SimpleCPlusPlusProgram(NCFGen, NCFGen.o libOLAFParse.a libOLAFParseT.a,$(Libs) $(DTSVCLIB) $(TTLIB))
 SimpleCPlusPlusProgram(MixedGen, MixedGen.o RemoteId.o libOLAFParse.a libOLAFParseT.a,$(Libs) $(DTSVCLIB) $(TTLIB))
 SimpleCPlusPlusProgram(StyleUpdate, StyleUpdate.o libOLAFParse.a libOLAFParseT.a,$(Libs) $(DTSVCLIB) $(TTLIB))
-#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
+#elif defined(LinuxArchitecture) || defined(BSDArchitecture) || \
+      defined(SunArchitecture)
 TEMPLATE_OBJS = TKTemplate.o
 RealLibrary(OLAFParse,$(OBJS),$(LIBDIR))
 SimpleCPlusPlusProgram(NodeParser, NodeParser.o $(TEMPLATE_OBJS) libOLAFParse.a,$(Libs))
index 16bfba5fa0693438639b31a1c3abc085b5cf4a0c..bc2fe3754c07073fb6290eae4e58c9354b987418 100644 (file)
@@ -53,7 +53,8 @@
 
 #include <stdlib.h>
 
-#if !defined(__osf__) && !defined(USL) && !defined(linux) && !defined(CSRG_BASED)
+#if !defined(__osf__) && !defined(USL) && !defined(linux) && \
+    !defined(CSRG_BASED) && !defined(sun)
 # include <osfcn.h>
 #endif
 
index 78c82b74a52518fa6c078a6d11b9810088e5cb43..de608b53ce06041e361941006bea32e6a6620086 100644 (file)
@@ -43,7 +43,8 @@
 
 #include <stdlib.h>
 
-#if !defined(__osf__) && !defined(USL) && !defined(linux) && !defined(CSRG_BASED)
+#if !defined(__osf__) && !defined(USL) && !defined(linux) && \
+    !defined(CSRG_BASED) && !defined(sun)
 #include <osfcn.h>
 #endif
 
index 1c55d73b686efd422b81de7dea7e683048386983..2ea09deb3d7f71de347ce4143192cbe8be76bb0a 100644 (file)
@@ -36,7 +36,7 @@ public:
 
   const char *msg(void) { return msg_; };
 
-  DECLARE_EXCEPTION(Unexpected, Exception);
+  DECLARE_EXCEPTION(Unexpected, Exception)
   
 private:
   const char *msg_;
index a64a0222baa99dd27e6baf9b92d3268d6c1828c0..7f8e50f94e2526cf4753582d1af3b50a1bb332fa 100644 (file)
@@ -144,7 +144,7 @@ public:
   int f_source;
   int f_severity;
 
-  DECLARE_EXCEPTION(ErrorReported, Exception);
+  DECLARE_EXCEPTION(ErrorReported, Exception)
 };
 
 
index ae8942685b56a3aaf669c066827a0a97e90efbb0..5af2584344b33c4890e67056feefcaadbe767736 100644 (file)
@@ -42,6 +42,9 @@
 #endif
 #include <ctype.h>
 #include <signal.h>
+#if !defined(CSRG_BASED)
+#include <sys/sysmacros.h>
+#endif
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <X11/Intrinsic.h>
index b22a2f1883be980b908999f4d455017dcb58044b..36f1dbdaa815f176d0ce2097ad709252e488fc59 100644 (file)
@@ -54,7 +54,8 @@
 
 #include <stdlib.h>
 
-#if !defined(__osf__) && !defined(USL) && !defined(linux) && !defined(CSRG_BASED)
+#if !defined(__osf__) && !defined(USL) && !defined(linux) && \
+    !defined(CSRG_BASED) && !defined(sun)
 # include <osfcn.h>
 #else
 # include <unistd.h>
index 3c5d6260bc8f47e74923341da8a1d555754255c5..fb1bf67243b64c9e57ea642deedaf4e78d3c98ed 100644 (file)
@@ -42,7 +42,8 @@
 #ifdef __cplusplus
 
 #include <stdlib.h>
-#if !defined(__osf__) && !defined(USL) && !defined(linux) && !defined(CSRG_BASED)
+#if !defined(__osf__) && !defined(USL) && !defined(linux) && \
+    !defined(CSRG_BASED) && !defined(sun)
 #include <osfcn.h>
 #endif
 
@@ -190,7 +191,8 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
 #define YY_CHAR unsigned char
 #define INITIAL 0
 
-#if !defined(__osf__) && !defined(USL) && !defined(linux) && !defined(CSRG_BASED)
+#if !defined(__osf__) && !defined(USL) && !defined(linux) && \
+    !defined(CSRG_BASED) && !defined(sun)
 #include <osfcn.h>
 #else
 #include <unistd.h>
index 0dcb327f333760408083fd2da9a51d7f6499ec01..ec02fdca18dd3b2246ef1db4a5ed62badfd678dd 100644 (file)
@@ -25,11 +25,11 @@ XCOMM                  Campbell, CA  95008
 XCOMM 
 XCOMM 
 
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 NormalCplusplusObjectRule()
 
-INCLUDES=$(GLOBAL_INCLUDES) $(MMDB_INCLUDES) $(EXCEPTIONS_INCLUDES)
+INCLUDES=$(CXXDEPENDINCLUDES) $(GLOBAL_INCLUDES) $(MMDB_INCLUDES) $(EXCEPTIONS_INCLUDES)
 
 
  
index bbb0c014bd01df09b776ee1ab52c03a4c5baa9d2..304c1def49afe2f2f6bf314108e648098a5bac15 100644 (file)
@@ -1,14 +1,14 @@
 XCOMM $TOG: Imakefile /main/14 1997/09/05 11:32:36 samborn $
 
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 NormalCplusplusObjectRule()
 
-INCLUDES=$(EXCEPTIONS_INCLUDES) $(COMMON_CLASS_INCLUDES)
+INCLUDES=$(CXXDEPENDINCLUDES) $(EXCEPTIONS_INCLUDES) $(COMMON_CLASS_INCLUDES)
 
 DEFINES=-DCDE_NEXT
 
-#if defined(CplusplusCompilerMajorVersion) && (CplusplusCompilerMajorVersion == 4)
+#if defined(CplusplusCompilerMajorVersion) && (CplusplusCompilerMajorVersion > 3)
 TEMPLATE_OBJS=
 #else
 TEMPLATE_OBJS=$(OLIAS)/mmdb/StyleSheet/SSTemplates.o
@@ -148,7 +148,7 @@ DTI_CC_OBJS = \
        $(MMDB_DIR)/dti_cc/CC_String.o          $(MMDB_DIR)/dti_cc/CC_Tokenizer.o \
        $(MMDB_DIR)/dti_cc/CC_Stack.o           $(MMDB_DIR)/dti_cc/CC_Slist.o
 
-#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion != 4)
+#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion < 4)
 EXTRA_HARDCOPY_OBJS = $(MMDB_DIR)/HardCopy/TemplatesAutoNumber.o
 #endif
 
@@ -157,7 +157,7 @@ HARDCOPY_OBJS = \
        $(MMDB_DIR)/HardCopy/autoNumber.o               $(MMDB_DIR)/HardCopy/autoNumberFP.o \
        $(EXTRA_HARDCOPY_OBJS)
 
-#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion != 4)
+#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion < 4)
 EXTRA_STYLESHEET_OBJS = $(MMDB_DIR)/StyleSheet/SSTemplates.o
 #endif
 
@@ -191,7 +191,7 @@ ALL_MMDB_OBJS =     $(API_OBJS)             $(BTREE_OBJS) \
 
 #ifdef AIXArchitecture
 Libs=  $(STATIC) $(ALL_MMDB_OBJS)  $(MATH_LIB) $(DTSVC_LIBRARY) $(TTLIB) $(SYS_LIBRARIES)
-#elif defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
+#elif defined(SunArchitecture) && CplusplusCompilerMajorVersion > 5
 Libs=  $(STATIC) -L../../../mmdb -lMMDB -lMMDBTemplates $(MATH_LIB) $(SYS_LIBRARIES)
 #else
 Libs=  $(STATIC) -L../../../mmdb -lMMDB $(MATH_LIB) $(SYS_LIBRARIES)
index 6d29de4ebd0866585a6b6046f3640b36872490e2..dd5951fc83296a2849cab48ff294d0705f5fcde2 100644 (file)
@@ -1,10 +1,12 @@
 XCOMM $TOG: Imakefile /main/11 1997/12/31 09:07:38 bill $
 
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 NormalLibraryObjectRule()
 
-INCLUDES  = -I.. $(EXCEPTIONS_INCLUDES) $(COMMON_CLASS_INCLUDES)
+NormalCplusplusObjectRule()
+
+INCLUDES  = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES) $(COMMON_CLASS_INCLUDES)
 CINCLUDES = -I..
 
  
@@ -196,7 +198,8 @@ Libs_C_API = $(MMDB_LIBS_C_API) $(DTSVCLIB) $(TTLIB) $(XLIB) $(MATH_LIB)
 SimpleCPlusPlusProgram(dbdrv,main.o,$(Libs))
 SimpleCPlusPlusProgram(restore,restore.o,$(Libs))
 
-#if defined(USLArchitecture) || defined(LinuxArchitecture) || defined(BSDArchitecture)
+#if defined(USLArchitecture) || defined(LinuxArchitecture) || \
+    defined(BSDArchitecture) || defined(SunArchitecture)
 SimpleCPlusPlusProgram(dbdrv_c_api,main_c_api.o,$(Libs_C_API))
 #else
 SimpleCProgram(dbdrv_c_api,main_c_api.o,$(Libs_C_API))
index 372872b734316408437911ae04d67691d0d24946..677540a0f55c825a755ad3e28a07bffd6efba2d4 100644 (file)
@@ -21,7 +21,7 @@ XCOMM         .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
 
 XCOMM Do not put any -g here, will cause the generation of MasterTemplate.c.c
@@ -34,9 +34,10 @@ DEFINES=-DCDE_NEXT
 DEFINES=
 #endif
 
-INCLUDES = -I$(DTMMDBSRC)/HardCopy $(EXCEPTIONS_INCLUDES) $(COMMON_CLASS_INCLUDES) -I$(DTMMDBSRC)
+INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMDBSRC)/HardCopy $(EXCEPTIONS_INCLUDES) $(COMMON_CLASS_INCLUDES) -I$(DTMMDBSRC)
 
-#if defined(CplusplusCompilerMajorVersion) && (CplusplusCompilerMajorVersion == 4)
+#if defined(CplusplusCompilerMajorVersion) && \
+    (CplusplusCompilerMajorVersion == 4) && !defined(SunArchitecture)
 XCOMM need the ptr repository
 CXXEXTRA_DEFINES = -ptr../templates
 #endif
@@ -71,7 +72,8 @@ LinkSourceFile(all_tmpls,$(DTMMDBSRC)/HardCopy)
 SpecialCPlusPlusObjectRule(TemplatesAutoNumber.o,,+Tall_tmpls -DEXPAND_TEMPLATES)
 #elif defined(AlphaArchitecture)       
 SpecialCPlusPlusObjectRule(TemplatesAutoNumber.o,,-ptf -DEXPAND_TEMPLATES)
-#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
+#elif defined(LinuxArchitecture) || defined(BSDArchitecture) || \
+      defined(SunArchitecture)
 SpecialCPlusPlusObjectRule(TemplatesAutoNumber.o,,-DEXPAND_TEMPLATES)
 SpecialCPlusPlusExpandRule(TemplatesAutoNumber..c,TemplatesAutoNumber.C,-DEXPAND_TEMPLATES)
 #else
index 235fb7a145f0cf8a9b4fdf5005d42ba8129498e4..42566dbc6a6d0b0481e0731f9d3e7b86503609bb 100644 (file)
@@ -240,7 +240,7 @@ XCOMM Variables to switch on debug mode temporarily
 XCOMM CDEBUGFLAGS = -g -DDEBUG
 XCOMM CXXDEBUGFLAGS = -g -DDEBUG
 
-#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
+#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 5
 AllTarget(libMMDBTemplates.a)
 
 libMMDBTemplates.a:
index facee7e716ae3bcf9a4d1d24dd092797d12fd4a4..e2fd7b723a305b56733b40bfc539997b44727f2c 100644 (file)
@@ -21,7 +21,7 @@ XCOMM         .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
 
 #ifdef DtinfoClient
@@ -30,7 +30,7 @@ DEFINES = -DCDE_NEXT
 DEFINES =
 #endif
 
-INCLUDES = -I$(DTMMDBSRC)/StyleSheet $(EXCEPTIONS_INCLUDES) $(COMMON_CLASS_INCLUDES) -I$(DTMMDBSRC)
+INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMDBSRC)/StyleSheet $(EXCEPTIONS_INCLUDES) $(COMMON_CLASS_INCLUDES) -I$(DTMMDBSRC)
 
 #ifdef RegenParserFiles
 LinkSourceFile(defParser.y,$(DTMMDBSRC)/StyleSheet)
@@ -50,7 +50,8 @@ YaccTarget(defParser,defParser)
 #endif
 
 
-#if defined(CplusplusCompilerMajorVersion) && (CplusplusCompilerMajorVersion == 4)
+#if defined(CplusplusCompilerMajorVersion) && \
+    (CplusplusCompilerMajorVersion == 4) && !defined(SunArchitecture)
 XCOMM need the ptr repository
 CXXEXTRA_DEFINES = -ptr../templates
 #endif
@@ -111,7 +112,8 @@ LinkSourceFile(all_tmpls,$(DTMMDBSRC)/StyleSheet)
 SpecialCPlusPlusObjectRule(SSTemplates.o,,+Tall_tmpls -DEXPAND_TEMPLATES)
 #elif defined(AlphaArchitecture)
 SpecialCPlusPlusObjectRule(SSTemplates.o,,-ptf -DEXPAND_TEMPLATES)
-#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
+#elif defined(LinuxArchitecture) || defined(BSDArchitecture) || \
+      defined(SunArchitecture)
 SpecialCPlusPlusObjectRule(SSTemplates.o,,-DEXPAND_TEMPLATES)
 SpecialCPlusPlusExpandRule(SSTemplates..c,SSTemplates.C,-DEXPAND_TEMPLATES)
 #else
index 2ec38fcc51409f7a17e2644aa0daa1197469b795..fdd6f0a30a83745170c30cae4481488efb91efa6 100644 (file)
@@ -21,10 +21,14 @@ XCOMM               .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
+
+#if defined(SunArchitecture)
+EXCEPTION_DEFINES  = -DNATIVE_EXCEPTIONS
+#endif
 
 DEFINES  = 
-INCLUDES = -I$(DTMMDBSRC)/api -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES) -I$(DTMMDBSRC)/misc
+INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMDBSRC)/api -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES) -I$(DTMMDBSRC)/misc
 
 LinkSourceFile(base.C,$(DTMMDBSRC)/api)
 LinkSourceFile(info_base.C,$(DTMMDBSRC)/api)
index c4181310bf7da4549c85f24381b32d5192d881cd..8839abe17b204dcf8151960cae0513c18d6eee7b 100644 (file)
@@ -21,10 +21,10 @@ XCOMM               .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 DEFINES  = 
-INCLUDES = -I$(DTMMDBSRC)/btree -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMDBSRC)/btree -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)
 
 LinkSourceFile(mmdb_btree.C,$(DTMMDBSRC)/btree)
 
index 0eba88513e009ac57b7299051c7636abf2b8b5e0..4ba7b16f1f59308463cc2e662182484c987dc2c1 100644 (file)
@@ -20,8 +20,9 @@ XCOMM         .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibHeaders     NO
 #define LibCreate      NO
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES  = -DMEMMOVE
-INCLUDES = -I$(DTMMDBSRC)/btree_berkeley -I$(DTMMDBSRC)
+INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMDBSRC)/btree_berkeley -I$(DTMMDBSRC)
 
 XCOMM Integretion Berkeley ndbm packege (sun.4.1.3 version) to mmdb:  
 XCOMM 9/15/93.  qfc
index 9568241b2c3cd662c345feeab10253172e2f0f81..e8977e3d4afbc245f502525acdccbb3a3666b965 100644 (file)
@@ -21,10 +21,10 @@ XCOMM               .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 DEFINES  = 
-INCLUDES = -I$(DTMMDBSRC)/compression -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES) 
+INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMDBSRC)/compression -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)
 
 LinkSourceFile(abs_agent.C,$(DTMMDBSRC)/compression)
 LinkSourceFile(zip.C,$(DTMMDBSRC)/compression)
index 9466116dd0735a2b0af839e188e1fe071a49c62b..4984884ac2d3203b5c3daebb1aae2b9481216cf1 100644 (file)
@@ -21,10 +21,10 @@ XCOMM               .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 DEFINES  = 
-INCLUDES = -I$(DTMMDBSRC)/diskhash -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMDBSRC)/diskhash -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)
 
 LinkSourceFile(disk_bucket.C,$(DTMMDBSRC)/diskhash)
 LinkSourceFile(bucket_array.C,$(DTMMDBSRC)/diskhash)
index c3d192060dceaf2af95febe305272130848b28ae..290842063108ca1f57f35e644e7a1877d96b063e 100644 (file)
@@ -21,14 +21,14 @@ XCOMM               .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 #if defined(LinuxArchitecture) || defined(BSDArchitecture)
 EXCEPTION_DEFINES  = -DNATIVE_EXCEPTIONS
 #endif
 
 DEFINES  = $(EXCEPTION_DEFINES)
-INCLUDES = -I$(DTMMDBSRC)/dstr -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMDBSRC)/dstr -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)
 
 LinkSourceFile(set.C,$(DTMMDBSRC)/dstr)
 LinkSourceFile(bset.C,$(DTMMDBSRC)/dstr)
index 34ba9a96fef9a7db66f460f64d579d9f530ebb4e..3a995df226cf9a2d5375159c1a69540b4c25cfd0 100644 (file)
@@ -21,11 +21,11 @@ XCOMM               .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
 
 DEFINES  = 
-INCLUDES = -I$(DTMMDBSRC)/dti_cc $(EXCEPTIONS_INCLUDES) $(COMMON_CLASS_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMDBSRC)/dti_cc $(EXCEPTIONS_INCLUDES) $(COMMON_CLASS_INCLUDES)
 
 LinkSourceFile(CC_Listbase.C,$(DTMMDBSRC)/dti_cc)
 LinkSourceFile(cc_exceptions.C,$(DTMMDBSRC)/dti_cc)
index d4854da8e415a5d87710829caee5ce48b5bdeff9..b61a45bc94fa58d98a960aee8d1e6becb488879e 100644 (file)
@@ -21,16 +21,16 @@ XCOMM               .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 #if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
-EXCEPTION_DEFINES  = -DHAS_TERMINATE
+EXCEPTION_DEFINES  = -DHAS_TERMINATE -DNATIVE_EXCEPTIONS
 #elif defined(LinuxArchitecture) || defined(BSDArchitecture)
 EXCEPTION_DEFINES  = -DNATIVE_EXCEPTIONS
 #endif
 
 DEFINES  = -DCC_VERSION=30 -DCHECK_INITIALIZED $(EXCEPTION_DEFINES)
-INCLUDES = -I$(DTMMDBSRC)/dti_excs
+INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMDBSRC)/dti_excs
 
 LinkSourceFile(Jump_Environment.C,$(DTMMDBSRC)/dti_excs)
 LinkSourceFile(Exceptions.C,$(DTMMDBSRC)/dti_excs)
index 5545802ee0fb94bfc50ae8ccb2ff5c035d8c0b9f..b9a69e28d58de0ce4014314b64c811be2d18d898 100644 (file)
@@ -21,10 +21,10 @@ XCOMM               .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 DEFINES  = 
-INCLUDES = -I$(DTMMDBSRC)/dynhash -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMDBSRC)/dynhash -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)
 
 LinkSourceFile(data_t.C,$(DTMMDBSRC)/dynhash)
 LinkSourceFile(imp_bucket.C,$(DTMMDBSRC)/dynhash)
index daf3118f7594ae39af48336c00bf56fc9696a814..f6d86e2cb9a48a1998ac1d28d8772b607512f2a9 100644 (file)
@@ -21,14 +21,14 @@ XCOMM               .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 #if defined(LinuxArchitecture) || defined(BSDArchitecture)
 EXCEPTION_DEFINES  = -DNATIVE_EXCEPTIONS
 #endif
 
 DEFINES  = -DPORTABLE_DB $(EXCEPTION_DEFINES)
-INCLUDES = -I$(DTMMDBSRC)/hmphf -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMDBSRC)/hmphf -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)
 
 LinkSourceFile(buckets.C,$(DTMMDBSRC)/hmphf)
 LinkSourceFile(mphf_funcs.C,$(DTMMDBSRC)/hmphf)
index c2ac85b982180b3862b66f0cd03ffe78c1cc1c06..15dcbe8be06bfde17178a3c2595fc435bf78f4b6 100644 (file)
@@ -21,10 +21,10 @@ XCOMM               .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 DEFINES  = -DPORTABLE_DB
-INCLUDES = -I$(DTMMDBSRC)/index -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMDBSRC)/index -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)
 
 LinkSourceFile(btree_index.C,$(DTMMDBSRC)/index)
 LinkSourceFile(dyn_disk_index.C,$(DTMMDBSRC)/index)
index 14333329b7de19fe5ed9c377b49294b008153271..f47be6b1b01fdb1d8bd96943edd172b4dc623e86 100644 (file)
@@ -21,10 +21,10 @@ XCOMM               .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 DEFINES  = -DCOMPACTED_DISK_REP -DPORTABLE_DB
-INCLUDES = -I$(DTMMDBSRC)/mgrs -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMDBSRC)/mgrs -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)
 
 LinkSourceFile(managers.C,$(DTMMDBSRC)/mgrs)
 LinkSourceFile(misc.C,$(DTMMDBSRC)/mgrs)
index dca26752edf4488ad225f777e9e6337ecbcbb653..13e1f0127c80785f896c8fa6775947a98ca3effb 100644 (file)
@@ -21,10 +21,10 @@ XCOMM               .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 DEFINES  = -DPORTABLE_DB
-INCLUDES = -I$(DTMMBDSRC)/object -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMBDSRC)/object -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)
 
 LinkSourceFile(composite.C,$(DTMMDBSRC)/object)
 LinkSourceFile(compressed_pstring.C,$(DTMMDBSRC)/object)
index 684aeb82506580a5cba882a63a53190c0fa6eaad..9b295138ac10430799e75779291a5edda0bad867 100644 (file)
@@ -21,14 +21,14 @@ XCOMM               .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 #ifdef DtinfoClient
 DEFINES= -DNO_DB_LOCK -DCDE_NEXT
 #else
 DEFINES= -DNO_DB_LOCK $(BYTE_ORDER_DEFINES)
 #endif
-INCLUDES = -I$(DTMMDBSRC)/oliasdb -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES) $(COMMON_CLASS_INCLUDES) -I$(DTMMDBSRC)/misc
+INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMDBSRC)/oliasdb -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES) $(COMMON_CLASS_INCLUDES) -I$(DTMMDBSRC)/misc
 
 LinkSourceFile(asciiIn_filters.C,$(DTMMDBSRC)/oliasdb)
 LinkSourceFile(collectionIterator.C,$(DTMMDBSRC)/oliasdb)
index 1a5b1c04144e5875d7c0ff6eb75bd5fade053ef8..0fe31d25879b919b04c2d076d0e11e92f15519c9 100644 (file)
@@ -21,10 +21,10 @@ XCOMM               .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 DEFINES  = -DPORTABLE_DB
-INCLUDES = -I$(DTMMDBSRC)/schema -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES) -I$(DTMMDBSRC)/misc
+INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMDBSRC)/schema -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES) -I$(DTMMDBSRC)/misc
 
 LinkSourceFile(agent_desc.C,$(DTMMDBSRC)/schema)
 LinkSourceFile(container_desc.C,$(DTMMDBSRC)/schema)
index 9009d4e39d09598427afe742f6987eae242c5a3b..6a8b4f3a3da4f24479d684449f8c99a31e567a3c 100644 (file)
@@ -21,10 +21,10 @@ XCOMM               .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 DEFINES  = -DPORTABLE_DB
-INCLUDES = -I$(DTMMDBSRC)/storage -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMDBSRC)/storage -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)
 
 LinkSourceFile(abs_storage.C,$(DTMMDBSRC)/storage)
 LinkSourceFile(chunks_index.C,$(DTMMDBSRC)/storage)
index 8ca138f0c76387acbabdfc32a317aa39e061d923..9c53bcfde5d39bde2beb25202710e5e3e9795bb1 100644 (file)
@@ -21,10 +21,10 @@ XCOMM               .../programs/dtinfo/mmdb/<subdir>/Imakefile
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+DEPEND_DEFINES = $(DEPENDDEFINES)
 
 DEFINES  = -DPORTABLE_DB
-INCLUDES = -I$(DTMMDBSRC)/utility -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES) -I$(DTMMDBSRC)/misc
+INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMDBSRC)/utility -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES) -I$(DTMMDBSRC)/misc
 
 LinkSourceFile(atoi_fast.C,$(DTMMDBSRC)/utility)
 LinkSourceFile(atoi_larson.C,$(DTMMDBSRC)/utility)
index b20ae7a2d0af1f197b8fc0b57480355f5fba640d..29aabae55b89a1b9e1d664fa463d4fbd0c08fecc 100644 (file)
@@ -2,6 +2,7 @@ XCOMM $TOG: Imakefile /main/15 1998/04/07 08:55:29 mgreess $
 DESKTOP_VERSION_STRING = DesktopVersionString
 
 KSH93SRC = ./ksh93
+DEPEND_DEFINES = $(DEPENDDEFINES)
 INCLUDES = -I. -I$(KSH93SRC)/include/ast -I$(KSH93SRC)/src/cmd/ksh93/include -I$(KSH93SRC)/src/cmd/ksh93
 
 /* DEPLIBS contains the list of library depencies for a client.
index fe69042d27e977b938de2ddc5445cbc08e3620d4..41b47babae4cb149ae3f1ed6dcf8acdf654e686d 100644 (file)
@@ -68,7 +68,7 @@
 #include "msgs.h"
 
 #if defined(SYSV) || defined(SVR4_0) || defined(SVR4) || defined(DEC) \
-       || defined(CSRG_BASED) || defined(linux)
+       || defined(CSRG_BASED) || defined(linux) || defined(sun)
 #define lsprintf sprintf
 #endif
 
index 3677918c530e173fefc76590d7680ec4f12b4678..91e6f1aebd6875913fe556eba28f2ee461057cc3 100644 (file)
@@ -4,6 +4,7 @@ SRCS =
 SUBCFLAGS = -O
 UFLAGS = $(SUBCFLAGS)
 ULDFLAGS =
+IFFECDEBUGFLAGS = -O0
 
 #ifdef RsArchitecture
 CCFLAGS = CCFLAGS="   "
@@ -38,6 +39,7 @@ SUIDEXECDEFINES = \
        -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\"
 
 CCFLAGS = $(CDEBUGFLAGS) $(SUIDEXECDEFINES) $(STD_DEFINES) $(ANSI_DEFINES)
+ICCFLAGS = $(IFFECDEBUGFLAGS) $(STD_DEFINES) $(ANSI_DEFINES)
 
 all:: ksh93src ksh93.o
 
@@ -56,7 +58,7 @@ ALL_SUBS = *
 
 ksh93src:
        $(RM) $(SHIP_DIR)/$(ALL_SUBS)/$(ALL_SUBS)/BUILT; \
-       SHELL=$(KORNSHELL) CC="$(CC)" CCFLAGS="$(CCFLAGS)" $(KORNSHELL) ship/shipin $(FORCE_SHIP)
+       SHELL=$(KORNSHELL) CC="$(CC)" CCFLAGS="$(CCFLAGS)" ICCFLAGS="$(ICCFLAGS)" $(KORNSHELL) ship/shipin $(FORCE_SHIP)
 
 ksh93.o: $(OBJS)
        $(LD) -r -o $@ $(OBJS)
index 73de70ad179c7e7956cde1197aca09af44dd68a4..10282e5617d50624024075147980f35a538c0a49 100644 (file)
@@ -48,18 +48,18 @@ setv mam_libdl `(set -; cd /tmp; echo 'main(){return(0);}' > x.${!-$$}.c; ${CC}
 setv mam_libdld `(set -; cd /tmp; echo 'main(){return(0);}' > x.${!-$$}.c; ${CC} ${CCFLAGS}    -o x.${!-$$}.x x.${!-$$}.c -ldld >/dev/null 2>&1 && echo ' -ldld'; rm -f x.${!-$$}.[cox])`
 setv mam_libintl `(set -; cd /tmp; echo 'main(){return(0);}' > x.${!-$$}.c; ${CC} ${CCFLAGS}    -o x.${!-$$}.x x.${!-$$}.c -lintl >/dev/null 2>&1 && echo ' -lintl'; rm -f x.${!-$$}.[cox])`
 setv mam_libast ${mam_cc_L+-last}${mam_cc_L-${INSTALLROOT}/lib/libast.a}
-exec - iffe set cc ${CC} ${CCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_cc_static} ${mam_libm} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libjobs} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libi} ${mam_cc_dynamic} ${mam_libdl} ${mam_libdld} ${mam_cc_static} ${mam_libintl} ${mam_cc_dynamic} ${mam_libast} : run features/externs
+exec - iffe set cc ${CC} ${ICCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_cc_static} ${mam_libm} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libjobs} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libi} ${mam_cc_dynamic} ${mam_libdl} ${mam_libdld} ${mam_cc_static} ${mam_libintl} ${mam_cc_dynamic} ${mam_libast} : run features/externs
 done FEATURE/externs generated
 make FEATURE/execargs implicit
-exec - iffe set cc ${CC} ${CCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_cc_static} ${mam_libm} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libjobs} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libi} ${mam_cc_dynamic} ${mam_libdl} ${mam_libdld} ${mam_cc_static} ${mam_libintl} ${mam_cc_dynamic} ${mam_libast} : def execargs
+exec - iffe set cc ${CC} ${ICCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_cc_static} ${mam_libm} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libjobs} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libi} ${mam_cc_dynamic} ${mam_libdl} ${mam_libdld} ${mam_cc_static} ${mam_libintl} ${mam_cc_dynamic} ${mam_libast} : def execargs
 done FEATURE/execargs generated
 make FEATURE/pstat implicit
-exec - iffe set cc ${CC} ${CCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_cc_static} ${mam_libm} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libjobs} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libi} ${mam_cc_dynamic} ${mam_libdl} ${mam_libdld} ${mam_cc_static} ${mam_libintl} ${mam_cc_dynamic} ${mam_libast} : def pstat
+exec - iffe set cc ${CC} ${ICCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_cc_static} ${mam_libm} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libjobs} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libi} ${mam_cc_dynamic} ${mam_libdl} ${mam_libdld} ${mam_cc_static} ${mam_libintl} ${mam_cc_dynamic} ${mam_libast} : def pstat
 done FEATURE/pstat generated
 make FEATURE/time implicit
 make features/time
 done features/time
-exec - iffe set cc ${CC} ${CCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_cc_static} ${mam_libm} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libjobs} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libi} ${mam_cc_dynamic} ${mam_libdl} ${mam_libdld} ${mam_cc_static} ${mam_libintl} ${mam_cc_dynamic} ${mam_libast} : run features/time
+exec - iffe set cc ${CC} ${ICCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_cc_static} ${mam_libm} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libjobs} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libi} ${mam_cc_dynamic} ${mam_libdl} ${mam_libdld} ${mam_cc_static} ${mam_libintl} ${mam_cc_dynamic} ${mam_libast} : run features/time
 done FEATURE/time generated
 make include/timeout.h implicit
 done include/timeout.h
@@ -71,14 +71,14 @@ make include/jobs.h implicit
 make FEATURE/ttys implicit
 make features/ttys
 done features/ttys
-exec - iffe set cc ${CC} ${CCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_cc_static} ${mam_libm} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libjobs} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libi} ${mam_cc_dynamic} ${mam_libdl} ${mam_libdld} ${mam_cc_static} ${mam_libintl} ${mam_cc_dynamic} ${mam_libast} : run features/ttys
+exec - iffe set cc ${CC} ${ICCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_cc_static} ${mam_libm} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libjobs} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libi} ${mam_cc_dynamic} ${mam_libdl} ${mam_libdld} ${mam_cc_static} ${mam_libintl} ${mam_cc_dynamic} ${mam_libast} : run features/ttys
 done FEATURE/ttys dontcare generated
 make FEATURE/options implicit
 make features/options.sh
 make OPTIONS implicit
 done OPTIONS
 done features/options.sh
-exec - iffe set cc ${CC} ${CCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_cc_static} ${mam_libm} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libjobs} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libi} ${mam_cc_dynamic} ${mam_libdl} ${mam_libdld} ${mam_cc_static} ${mam_libintl} ${mam_cc_dynamic} ${mam_libast} : run features/options.sh OPTIONS
+exec - iffe set cc ${CC} ${ICCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_cc_static} ${mam_libm} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libjobs} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libi} ${mam_cc_dynamic} ${mam_libdl} ${mam_libdld} ${mam_cc_static} ${mam_libintl} ${mam_cc_dynamic} ${mam_libast} : run features/options.sh OPTIONS
 done FEATURE/options dontcare generated
 done include/jobs.h
 make include/io.h implicit
@@ -89,7 +89,7 @@ done ${PACKAGE_ast_INCLUDE}/ast/ast.h
 done include/io.h
 make include/path.h implicit
 make FEATURE/acct implicit
-exec - iffe set cc ${CC} ${CCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_cc_static} ${mam_libm} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libjobs} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libi} ${mam_cc_dynamic} ${mam_libdl} ${mam_libdld} ${mam_cc_static} ${mam_libintl} ${mam_cc_dynamic} ${mam_libast} : def acct
+exec - iffe set cc ${CC} ${ICCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_cc_static} ${mam_libm} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libjobs} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libi} ${mam_cc_dynamic} ${mam_libdl} ${mam_libdld} ${mam_cc_static} ${mam_libintl} ${mam_cc_dynamic} ${mam_libast} : def acct
 done FEATURE/acct dontcare generated
 make FEATURE/options implicit
 done FEATURE/options dontcare generated
@@ -98,7 +98,7 @@ make include/variables.h implicit
 make FEATURE/dynamic implicit
 make features/dynamic
 done features/dynamic
-exec - iffe set cc ${CC} ${CCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_cc_static} ${mam_libm} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libjobs} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libi} ${mam_cc_dynamic} ${mam_libdl} ${mam_libdld} ${mam_cc_static} ${mam_libintl} ${mam_cc_dynamic} ${mam_libast} : run features/dynamic
+exec - iffe set cc ${CC} ${ICCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_cc_static} ${mam_libm} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libjobs} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libi} ${mam_cc_dynamic} ${mam_libdl} ${mam_libdld} ${mam_cc_static} ${mam_libintl} ${mam_cc_dynamic} ${mam_libast} : run features/dynamic
 done FEATURE/dynamic dontcare generated
 prev FEATURE/options implicit
 done include/variables.h
@@ -111,12 +111,12 @@ make include/fault.h implicit
 make FEATURE/sigfeatures implicit
 make features/sigfeatures
 done features/sigfeatures
-exec - iffe set cc ${CC} ${CCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_cc_static} ${mam_libm} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libjobs} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libi} ${mam_cc_dynamic} ${mam_libdl} ${mam_libdld} ${mam_cc_static} ${mam_libintl} ${mam_cc_dynamic} ${mam_libast} : run features/sigfeatures
+exec - iffe set cc ${CC} ${ICCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_cc_static} ${mam_libm} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libjobs} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libi} ${mam_cc_dynamic} ${mam_libdl} ${mam_libdld} ${mam_cc_static} ${mam_libintl} ${mam_cc_dynamic} ${mam_libast} : run features/sigfeatures
 done FEATURE/sigfeatures dontcare generated
 make FEATURE/setjmp implicit
 make features/setjmp
 done features/setjmp
-exec - iffe set cc ${CC} ${CCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_cc_static} ${mam_libm} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libjobs} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libi} ${mam_cc_dynamic} ${mam_libdl} ${mam_libdld} ${mam_cc_static} ${mam_libintl} ${mam_cc_dynamic} ${mam_libast} : run features/setjmp
+exec - iffe set cc ${CC} ${ICCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_cc_static} ${mam_libm} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libjobs} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libi} ${mam_cc_dynamic} ${mam_libdl} ${mam_libdld} ${mam_cc_static} ${mam_libintl} ${mam_cc_dynamic} ${mam_libast} : run features/setjmp
 done FEATURE/setjmp dontcare generated
 done include/fault.h
 prev include/history.h implicit
@@ -266,7 +266,7 @@ make bltins/sleep.c
 make FEATURE/poll implicit
 make features/poll
 done features/poll
-exec - iffe set cc ${CC} ${CCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_cc_static} ${mam_libm} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libjobs} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libi} ${mam_cc_dynamic} ${mam_libdl} ${mam_libdld} ${mam_cc_static} ${mam_libintl} ${mam_cc_dynamic} ${mam_libast} : run features/poll
+exec - iffe set cc ${CC} ${ICCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_cc_static} ${mam_libm} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libjobs} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libi} ${mam_cc_dynamic} ${mam_libdl} ${mam_libdld} ${mam_cc_static} ${mam_libintl} ${mam_cc_dynamic} ${mam_libast} : run features/poll
 done FEATURE/poll generated
 prev FEATURE/time implicit
 prev include/builtins.h implicit
@@ -326,7 +326,7 @@ prev FEATURE/time implicit
 make FEATURE/rlimits implicit
 make features/rlimits
 done features/rlimits
-exec - iffe set cc ${CC} ${CCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_cc_static} ${mam_libm} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libjobs} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libi} ${mam_cc_dynamic} ${mam_libdl} ${mam_libdld} ${mam_cc_static} ${mam_libintl} ${mam_cc_dynamic} ${mam_libast} : run features/rlimits
+exec - iffe set cc ${CC} ${ICCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_cc_static} ${mam_libm} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libjobs} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libi} ${mam_cc_dynamic} ${mam_libdl} ${mam_libdld} ${mam_cc_static} ${mam_libintl} ${mam_cc_dynamic} ${mam_libast} : run features/rlimits
 done FEATURE/rlimits dontcare generated
 done include/ulimit.h
 prev include/builtins.h implicit
@@ -370,7 +370,7 @@ make sh/arith.c
 make FEATURE/locale implicit
 make features/locale
 done features/locale
-exec - iffe set cc ${CC} ${CCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_cc_static} ${mam_libm} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libjobs} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libi} ${mam_cc_dynamic} ${mam_libdl} ${mam_libdld} ${mam_cc_static} ${mam_libintl} ${mam_cc_dynamic} ${mam_libast} : run features/locale
+exec - iffe set cc ${CC} ${ICCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_cc_static} ${mam_libm} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libjobs} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libi} ${mam_cc_dynamic} ${mam_libdl} ${mam_libdld} ${mam_cc_static} ${mam_libintl} ${mam_cc_dynamic} ${mam_libast} : run features/locale
 done FEATURE/locale generated
 make include/streval.h implicit
 done include/streval.h
@@ -828,7 +828,7 @@ make data/builtins.c
 make FEATURE/cmds implicit
 make features/cmds
 done features/cmds
-exec - iffe set cc ${CC} ${CCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_cc_static} ${mam_libm} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libjobs} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libi} ${mam_cc_dynamic} ${mam_libdl} ${mam_libdld} ${mam_cc_static} ${mam_libintl} ${mam_cc_dynamic} ${mam_libast} : run features/cmds
+exec - iffe set cc ${CC} ${ICCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_cc_static} ${mam_libm} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libjobs} ${mam_cc_dynamic} ${mam_cc_static} ${mam_libi} ${mam_cc_dynamic} ${mam_libdl} ${mam_libdld} ${mam_cc_static} ${mam_libintl} ${mam_cc_dynamic} ${mam_libast} : run features/cmds
 done FEATURE/cmds dontcare generated
 prev include/name.h implicit
 prev include/shtable.h implicit
index e0f54f177c8e73e2136b46502674ab6e9c560502..c2bd9214de4ed8386059b45e131b281fecdf7b25 100644 (file)
@@ -40,7 +40,7 @@ make bio.o
 make bio.c
 make FEATURE/mtio implicit
 setv mam_libast ${mam_cc_L+-last}${mam_cc_L-${INSTALLROOT}/lib/libast.a}
-exec - iffe set cc ${CC} ${CCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_libast} : def mtio
+exec - iffe set cc ${CC} ${ICCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_libast} : def mtio
 done FEATURE/mtio generated
 make pax.h implicit
 make ${INSTALLROOT}/include/ast/vdb.h implicit
index 0a7386829cb850e9fd9a26238f600db9e0d2d0ad..1ef90b83a2402fc4581f585b8b8f269b32dab441 100644 (file)
@@ -41,7 +41,7 @@ make ast_lib.h implicit
 make FEATURE/lib
 make features/lib
 done features/lib
-exec - iffe set cc ${CC} ${CCFLAGS}    ${LDFLAGS}  :   run features/lib
+exec - iffe set cc ${CC} ${ICCFLAGS}    ${LDFLAGS}  :   run features/lib
 done FEATURE/lib generated
 exec - cmp -s FEATURE/lib ast_lib.h || { rm -f ast_lib.h; cp FEATURE/lib ast_lib.h; }
 done ast_lib.h dontcare generated
@@ -52,12 +52,12 @@ prev ast_lib.h implicit
 make FEATURE/types implicit
 make features/types
 done features/types
-exec - iffe set cc ${CC} ${CCFLAGS}    ${LDFLAGS}  :   run features/types
+exec - iffe set cc ${CC} ${ICCFLAGS}    ${LDFLAGS}  :   run features/types
 done FEATURE/types generated
 make /usr/include/sys/types.h implicit
 done /usr/include/sys/types.h
 done features/botch.c
-exec - iffe set cc ${CC} ${CCFLAGS}  -I.  ${LDFLAGS}  :   run features/botch.c
+exec - iffe set cc ${CC} ${ICCFLAGS}  -I.  ${LDFLAGS}  :   run features/botch.c
 done FEATURE/botch generated
 exec - cmp -s FEATURE/botch ast_botch.h || { rm -f ast_botch.h; cp FEATURE/botch ast_botch.h; }
 done ast_botch.h dontcare generated
@@ -102,12 +102,12 @@ make conflib.h implicit
 make FEATURE/wait implicit
 make features/wait
 done features/wait
-exec - iffe set cc ${CC} ${CCFLAGS}    ${LDFLAGS}  :   run features/wait
+exec - iffe set cc ${CC} ${ICCFLAGS}    ${LDFLAGS}  :   run features/wait
 done FEATURE/wait generated
 done conflib.h
 prev FEATURE/types implicit
 make FEATURE/unistd.lcl implicit
-exec - iffe set cc ${CC} ${CCFLAGS}    ${LDFLAGS}  :   def unistd.lcl
+exec - iffe set cc ${CC} ${ICCFLAGS}    ${LDFLAGS}  :   def unistd.lcl
 done FEATURE/unistd.lcl generated
 make FEATURE/limits implicit
 make features/limits.c
@@ -118,19 +118,19 @@ prev FEATURE/types implicit
 make FEATURE/param implicit
 make features/param.sh
 done features/param.sh
-exec - iffe set cc ${CC} ${CCFLAGS}    ${LDFLAGS}  :   run features/param.sh
+exec - iffe set cc ${CC} ${ICCFLAGS}    ${LDFLAGS}  :   run features/param.sh
 done FEATURE/param generated
 prev FEATURE/unistd.lcl implicit
 make FEATURE/limits.lcl implicit
-exec - iffe set cc ${CC} ${CCFLAGS}    ${LDFLAGS}  :   def limits.lcl
+exec - iffe set cc ${CC} ${ICCFLAGS}    ${LDFLAGS}  :   def limits.lcl
 done FEATURE/limits.lcl generated
 prev FEATURE/lib implicit
 done features/limits.c
-exec - iffe set cc ${CC} ${CCFLAGS}  -I.  ${LDFLAGS}  :   run features/limits.c
+exec - iffe set cc ${CC} ${ICCFLAGS}  -I.  ${LDFLAGS}  :   run features/limits.c
 done FEATURE/limits generated
 prev FEATURE/lib implicit
 done features/unistd.c
-exec - iffe set cc ${CC} ${CCFLAGS}  -I.  ${LDFLAGS}  :   run features/unistd.c
+exec - iffe set cc ${CC} ${ICCFLAGS}  -I.  ${LDFLAGS}  :   run features/unistd.c
 done FEATURE/unistd generated
 exec - cmp -s FEATURE/unistd ast_unistd.h || { rm -f ast_unistd.h; cp FEATURE/unistd ast_unistd.h; }
 done ast_unistd.h dontcare generated
@@ -140,22 +140,22 @@ make features/fcntl.c
 make FEATURE/tty implicit
 make features/tty
 done features/tty
-exec - iffe set cc ${CC} ${CCFLAGS}    ${LDFLAGS}  :   run features/tty
+exec - iffe set cc ${CC} ${ICCFLAGS}    ${LDFLAGS}  :   run features/tty
 done FEATURE/tty generated
 prev FEATURE/unistd.lcl implicit
 make FEATURE/fcntl.lcl implicit
-exec - iffe set cc ${CC} ${CCFLAGS}    ${LDFLAGS}  :   def fcntl.lcl
+exec - iffe set cc ${CC} ${ICCFLAGS}    ${LDFLAGS}  :   def fcntl.lcl
 done FEATURE/fcntl.lcl generated
 prev ast_lib.h implicit
 make /usr/include/sys/stat.h implicit
 done /usr/include/sys/stat.h
 done features/fcntl.c
-exec - iffe set cc ${CC} ${CCFLAGS}  -I.  ${LDFLAGS}  :   run features/fcntl.c
+exec - iffe set cc ${CC} ${ICCFLAGS}  -I.  ${LDFLAGS}  :   run features/fcntl.c
 make ast_fs.h implicit
 make FEATURE/fs
 make features/fs
 done features/fs
-exec - iffe set cc ${CC} ${CCFLAGS}    ${LDFLAGS}  :   run features/fs
+exec - iffe set cc ${CC} ${ICCFLAGS}    ${LDFLAGS}  :   run features/fs
 done FEATURE/fs generated
 exec - cmp -s FEATURE/fs ast_fs.h || { rm -f ast_fs.h; cp FEATURE/fs ast_fs.h; }
 done ast_fs.h dontcare generated
@@ -175,7 +175,7 @@ make ast_hdr.h implicit
 make FEATURE/hdr
 make features/hdr
 done features/hdr
-exec - iffe set cc ${CC} ${CCFLAGS}    ${LDFLAGS}  :   run features/hdr
+exec - iffe set cc ${CC} ${ICCFLAGS}    ${LDFLAGS}  :   run features/hdr
 done FEATURE/hdr generated
 exec - cmp -s FEATURE/hdr ast_hdr.h || { rm -f ast_hdr.h; cp FEATURE/hdr ast_hdr.h; }
 done ast_hdr.h dontcare generated
@@ -200,7 +200,7 @@ done include/modecanon.h
 prev FEATURE/param implicit
 prev FEATURE/limits.lcl implicit
 done features/mode.c
-exec - iffe set cc ${CC} ${CCFLAGS}  -I. -Iinclude  ${LDFLAGS}  :   run features/mode.c
+exec - iffe set cc ${CC} ${ICCFLAGS}  -I. -Iinclude  ${LDFLAGS}  :   run features/mode.c
 done FEATURE/mode generated
 exec - cmp -s FEATURE/mode ast_mode.h || { rm -f ast_mode.h; cp FEATURE/mode ast_mode.h; }
 done ast_mode.h dontcare generated
@@ -508,7 +508,7 @@ make ast_time.h implicit
 make FEATURE/time
 make features/time
 done features/time
-exec - iffe set cc ${CC} ${CCFLAGS}    ${LDFLAGS}  :   run features/time
+exec - iffe set cc ${CC} ${ICCFLAGS}    ${LDFLAGS}  :   run features/time
 done FEATURE/time generated
 exec - cmp -s FEATURE/time ast_time.h || { rm -f ast_time.h; cp FEATURE/time ast_time.h; }
 done ast_time.h dontcare generated
@@ -534,7 +534,7 @@ make preroot.h implicit
 make FEATURE/preroot
 make features/preroot.sh
 done features/preroot.sh
-exec - iffe set cc ${CC} ${CCFLAGS}    ${LDFLAGS}  :   run features/preroot.sh
+exec - iffe set cc ${CC} ${ICCFLAGS}    ${LDFLAGS}  :   run features/preroot.sh
 done FEATURE/preroot generated
 exec - cmp -s FEATURE/preroot preroot.h || { rm -f preroot.h; cp FEATURE/preroot preroot.h; }
 done preroot.h generated
@@ -723,7 +723,7 @@ make align.h implicit
 make FEATURE/align
 make features/align.c
 done features/align.c
-exec - iffe set cc ${CC} ${CCFLAGS}    ${LDFLAGS}  :   run features/align.c
+exec - iffe set cc ${CC} ${ICCFLAGS}    ${LDFLAGS}  :   run features/align.c
 done FEATURE/align generated
 exec - cmp -s FEATURE/align align.h || { rm -f align.h; cp FEATURE/align align.h; }
 done align.h dontcare generated
@@ -733,7 +733,7 @@ make FEATURE/int
 make features/int.c
 prev FEATURE/types implicit
 done features/int.c
-exec - iffe set cc ${CC} ${CCFLAGS}  -I.  ${LDFLAGS}  :   run features/int.c
+exec - iffe set cc ${CC} ${ICCFLAGS}  -I.  ${LDFLAGS}  :   run features/int.c
 done FEATURE/int generated
 exec - cmp -s FEATURE/int int.h || { rm -f int.h; cp FEATURE/int int.h; }
 done int.h dontcare generated
@@ -756,7 +756,7 @@ make sig.h implicit
 make FEATURE/sig
 make features/sig.sh
 done features/sig.sh
-exec - iffe set cc ${CC} ${CCFLAGS}    ${LDFLAGS}  :   run features/sig.sh
+exec - iffe set cc ${CC} ${ICCFLAGS}    ${LDFLAGS}  :   run features/sig.sh
 done FEATURE/sig generated
 exec - cmp -s FEATURE/sig sig.h || { rm -f sig.h; cp FEATURE/sig sig.h; }
 done sig.h generated
@@ -1008,7 +1008,7 @@ make features/signal.c
 make /usr/include/signal.h implicit
 done /usr/include/signal.h
 done features/signal.c
-exec - iffe set cc ${CC} ${CCFLAGS}    ${LDFLAGS}  :   run features/signal.c
+exec - iffe set cc ${CC} ${ICCFLAGS}    ${LDFLAGS}  :   run features/signal.c
 done FEATURE/signal generated
 prev sig.h implicit
 prev include/ast.h implicit
@@ -1275,7 +1275,7 @@ make vmalloc/malloc.c
 make FEATURE/vmalloc implicit
 make features/vmalloc
 done features/vmalloc
-exec - iffe set cc ${CC} ${CCFLAGS}    ${LDFLAGS}  :   run features/vmalloc
+exec - iffe set cc ${CC} ${ICCFLAGS}    ${LDFLAGS}  :   run features/vmalloc
 done FEATURE/vmalloc dontcare generated
 prev ast_lib.h implicit
 done vmalloc/malloc.c
@@ -1911,7 +1911,7 @@ prev ast_tty.h implicit
 make FEATURE/sfio implicit
 make features/sfio
 done features/sfio
-exec - iffe set cc ${CC} ${CCFLAGS}    ${LDFLAGS}  :   run features/sfio
+exec - iffe set cc ${CC} ${ICCFLAGS}    ${LDFLAGS}  :   run features/sfio
 done FEATURE/sfio dontcare generated
 done sfio/sfhdr.h
 done sfio/sfclose.c
index 19fe806f7a10fd119676b78f7e31cc84698a6b80..474f30524fc1c3ecd3fa302547cc5bfa3c355466 100644 (file)
@@ -138,11 +138,12 @@ tst       pipe_rw exec{
 tst    real_vfork exec{
        int             code;
        extern int      vfork();
+       extern int      _exit(int);
        main()
        {
                code = 1;
                if (!vfork()) code = 0;
-               return code;
+               _exit(code);
        }
 }end
 
index bbe2725bdcc5e4a900b2d5aa42db68b1c5fb1473..e43cb6e3ea3e21b0d745f53183b3c9897b312bdb 100644 (file)
@@ -136,13 +136,14 @@ tst       pipe_rw note{ full duplex pipes }end execute{
 tst    real_vfork note{ vfork child shares data with parent }end execute{
        _BEGIN_EXTERNS_
        extern int      vfork();
+       extern int      _exit(int);
        _END_EXTERNS_
        int             code;
        main()
        {
                code = 1;
                if (!vfork()) code = 0;
-               return code;
+               _exit(code);
        }
 }end
 
index 1176f2fd78fc4c6c7e280cfdc9d793f37d0ee87a..b9caca8f20be95db68d6d32f461122d72a2c2c01 100644 (file)
 #endif
 #endif /* __cplusplus */
 
+#if defined(sun)
+#define _FILEDEFED     /**/
+#endif
+
 typedef struct _sfio_  Sfile_t, Sfio_t, SFIO;
 typedef struct _sfdc_  Sfdisc_t;
 typedef int            (*Sfread_f)_ARG_((Sfio_t*, Void_t*, int, Sfdisc_t*));
index bcc1c80696b850d9d7750d18c6581b6787e80743..d94755408e66a771ccb293a763b439c6f6590fd4 100644 (file)
@@ -301,7 +301,8 @@ loop_fa :
                        GETARG(form,form,argf,args,char*,char*,'1',t_user,n_user);
                        if(!form)
                                form = "";
-#if (defined(CSRG_BASED) && !defined(__LP64__)) || (defined(linux) && !defined(__LP64__))
+#if (defined(CSRG_BASED) && !defined(__LP64__)) || \
+    (defined(linux) && !defined(__LP64__)) || defined(sun)
                        GETARG(argsp,argsp,argf,args,va_list*,va_list*,'2',t_user,n_user);
                        memcpy((Void_t*)(&(fa->args)), (Void_t*)(&args), sizeof(va_list));
                        memcpy((Void_t*)(&args), (Void_t*)argsp, sizeof(va_list));
index ca0c72f04af0088bfb87f150c405d1dff7501301..6c6034137717197eac3901db02ee1a00e2577329 100644 (file)
@@ -97,7 +97,7 @@ exec - set -x
 exec - rm -f 1.${COTEMP}.*
 done cmd.req generated
 setv mam_libast ${mam_cc_L+-last}${mam_cc_L-${INSTALLROOT}/lib/libast.a}
-exec - iffe set cc ${CC} ${CCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_libast} : run features/symlink
+exec - iffe set cc ${CC} ${ICCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_libast} : run features/symlink
 done FEATURE/symlink generated
 prev ${INSTALLROOT}/include/ast/ftwalk.h implicit
 make /usr/include/ctype.h implicit
@@ -190,7 +190,7 @@ make FEATURE/ids implicit
 make features/ids
 done features/ids
 prev cmd.req
-exec - iffe set cc ${CC} ${CCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_libast} : run features/ids
+exec - iffe set cc ${CC} ${ICCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_libast} : run features/ids
 done FEATURE/ids generated
 prev cmdlib.h implicit
 done id.c
@@ -288,7 +288,7 @@ make FEATURE/utsname implicit
 make features/utsname
 done features/utsname
 prev cmd.req
-exec - iffe set cc ${CC} ${CCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_libast} : run features/utsname
+exec - iffe set cc ${CC} ${ICCFLAGS}    ${LDFLAGS}  :   ref ${mam_cc_L+-L${INSTALLROOT}/lib} ${mam_libast} : run features/utsname
 done FEATURE/utsname generated
 prev cmdlib.h implicit
 done uname.c
index 351c52d8cce65ec66d8dbb96d6eaf29898cd393b..29d5ff53edf8c58c5df44daf8e5a31d05513c8f2 100644 (file)
@@ -3738,7 +3738,7 @@ do_catopen(
    nl_catd nlmsg_fd = (nl_catd)-1;
    char * errmsg;
 #if defined(SVR4) || defined (_AIX) || defined(sco) || defined(DEC) || \
-    defined(CSRG_BASED) || defined(linux)
+    defined(CSRG_BASED) || defined(linux) || defined(sun)
    char * nextMatch;
 #endif
 
@@ -3763,7 +3763,7 @@ do_catopen(
 
       altCatName = XtMalloc(strlen(catName) + 10);
 #if defined(SVR4) || defined (_AIX) || defined(sco) || defined(DEC) || \
-    defined(CSRG_BASED) || defined(linux)
+    defined(CSRG_BASED) || defined(linux) || defined(sun)
       /* These platforms don't have strrstr() */
       ptr = NULL;
       nextMatch = catName;
index 7332e462e5c0dc3d3f8a81b0f70f0881df606521..b0b7911add2283f319baaaed73ac9e09c6789212 100644 (file)
@@ -106,7 +106,7 @@ SYS_LIBRARIES = -lsec
  *      on Solaris 2.4 and run on Solaris 2.5.  In Solaris 2.4 some of 
  *       libcmd.a functions are also in libauth.so.  But on Solaris 2.5 
  *       these Sun private functions have been removed from libauth.so. */
-SYS_LIBRARIES = -lm -ldl -lgen -lresolv -lC -lbsm -lcmd $(PAM_LIB)
+SYS_LIBRARIES = -lm -ldl -lgen -lresolv -lbsm -lcmd $(PAM_LIB)
    EXTRA_DEFINES = -DPAM
 
 
@@ -232,6 +232,7 @@ INCLUDES = -I$(XPROJECTROOT)/include/freetype2
                   -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
                   -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\"
 
+ DEPEND_DEFINES = $(DEPENDDEFINES)
 #if defined (HPArchitecture)
         DEFINES = $(DTDEFINES) -D_XPG2 -DAUDIT -DBYPASSLOGIN ServerExtraDefines
 #elif defined (RsArchitecture)
index 31b0f4a048af653a29bd8f0da00c7d89623ea011..4d3d14b7f252695d589de7f12bbb9821a20424ce 100644 (file)
@@ -98,7 +98,7 @@ XCOMM ##########################################################################
 #elif defined (_AIX)
    :0  Local local@console /usr/bin/X11/X -T -force :0
 #elif defined (sun)
-   :0  Local local_uid@console root /usr/openwin/bin/Xsun :0 -nobanner
+   :0  Local local_uid@console root /usr/openwin/bin/X :0 -nobanner
 #elif defined (__osf__)
 #if defined (_NO_CONSOLE)
 XCOMM   *  Local local_uid@console root /usr/bin/X11/X :0 -nice -2
index e497197631aab5f5391c3c8ef32fa439e693fce8..b26792ecccfe84aaa5df5c7103c2756ff1b8a118 100644 (file)
@@ -62,7 +62,8 @@
 # include      <time.h>
 # include      <utime.h>
 # include      <pwd.h>
-#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) || \
+    defined(sun)
 # include      <stdarg.h>
 #else
 # include      <varargs.h>
index 5180cecbf1a500cb981a8cbfe36a49ff7b0f3af3..8c2426847010facae449dbb5754e65227a8fe2ab 100644 (file)
@@ -230,7 +230,7 @@ char        bytes[64];
  *  the OS's random number device.
  */
 
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #define READ_LIMIT (sizeof (long) * 2)
 
 static sumFile (char *name, long sum[2])
@@ -447,7 +447,7 @@ InitCryptoKey( void )
 #if defined(linux) 
     /* non-blocking */
     char    *key_file = "/dev/urandom";
-#elif defined(CSRG_BASED)
+#elif defined(CSRG_BASED) || defined(sun)
     /* non-blocking */
     char    *key_file = "/dev/random";
 #else
index 4b25251374ba541c981806bc09440219bee915e0..ce98584c4d9212cb21ed475f3164ef9d427b1064 100644 (file)
@@ -182,7 +182,7 @@ PamAuthenticate ( char*   prog_name,
                 audit_login_maxtrys();
              }
           }
-#endif sun
+#endif
 
           if (status != PAM_SUCCESS) {
              sleep(PAM_LOGIN_SLEEPTIME);
@@ -327,7 +327,7 @@ PamAccounting( char*   prog_name,
                status = solaris_setutmp_mgmt(user, tty_line, display_name, 
                                         session_type, entry_type, entry_id); 
                if (status != SOLARIS_SUCCESS) {
-                    Debug("PamAccounting: LOGIN_PRCESS set_utmp error=%d\n", 
+                    Debug("PamAccounting: LOGIN_PROCESS set_utmp error=%d\n",
                                                                status);
                }
                break;
index 0fb2213637ce06f878edde9ffe47dc56b635eb35..65f183133f119a0a9190bf3f9b5963184308ce38 100644 (file)
@@ -70,7 +70,7 @@ extern int audit_login_success(void);
 extern int audit_login_save_pw(struct passwd *pwd);
 extern int audit_login_bad_pw(void);
 extern int audit_login_maxtrys(void);
-#endif sun
+#endif /* sun */
 
 
 #endif /* _DTLOGIN_PAM_SVC_H */
index 8163538397a1055ac3afd5f3360deb59e3a8663b..18776203e207de6d47f2910389050ac36e0d707f 100644 (file)
@@ -360,8 +360,10 @@ userEnv(
        env = setEnv (env, "USER", user);
 
 #ifdef sun
-       if ((Def_path = login_defaults(p,d)) != NULL) 
+       if ((Def_path = login_defaults(p,d)) != NULL) {
          env = setEnv (env, "PATH", Def_path);
+         free(Def_path);
+       }
 #else
         if (d->userPath && strlen(d->userPath) > 0)
           env = setEnv (env, "PATH", d->userPath);
@@ -457,7 +459,7 @@ login_defaults(
         register int  flags;
         register char *ptr;
        char *Def_path;
-       char final_path[MAXPATHLEN];
+       char *final_path = malloc(MAXPATHLEN);
        char *element;
  
 
@@ -474,13 +476,13 @@ login_defaults(
                 if ((Def_path = defread("SUPATH=")) != NULL)
                         Def_path = strdup(Def_path);
                else
-                       Def_path = DEF_SUPATH;
+                        Def_path = strdup(DEF_SUPATH);
              }
              else {
                 if ((Def_path = defread("PATH=")) != NULL)
                         Def_path = strdup(Def_path);
                else
-                       Def_path = DEF_PATH;
+                       Def_path = strdup(DEF_PATH);
              }
         }
 
index cdf849e73dd429b4e5a7133e75a370d4fcb7fe84..9298d81c6228ac83ed6bd645998bc8cde0177ae7 100644 (file)
@@ -7,7 +7,7 @@ XCOMM $TOG: Imakefile /main/8 1998/08/05 13:24:05 mgreess $
 #define LibHeaders     NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
 #include <Threads.tmpl>
 
index 85beb5bdd0c15ec8011234e811f3a02cbd14f8d6..1d045c2429fdcefb502f16d8eb6c333dd5f0e3e7 100644 (file)
@@ -70,7 +70,7 @@
 #include <assert.h>
 
 #if !defined(linux) && !defined(CSRG_BASED)
-extern forceUpdate( Widget );
+extern void forceUpdate( Widget );
 #endif
 
 InterruptibleCmd::InterruptibleCmd ( char *name, char *label, int active ) :
index 210abd55e76477d0921ed781da4910c1c1e76b02..cd6e89cf803c5b7b7625f2a7cdfcab712c6934ae 100644 (file)
@@ -1,7 +1,7 @@
 XCOMM $TOG: Imakefile /main/25 1998/02/17 15:18:16 mgreess $
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
 
 INCLUDES = -I. -I../include -I../include/MotifApp \
index a980e4fd6e8a260f7a9cd7788b958df03cee565a..d380dd4ec4f434d171f3e95a27b44fe98e39269a 100644 (file)
@@ -1,7 +1,7 @@
 XCOMM $TOG: Imakefile /main/15 1998/08/05 13:24:40 mgreess $
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
 
 INCLUDES = -I. -I../include -I../../dtcompat -I../../../. -I$(CDELIBSRC)
@@ -37,7 +37,7 @@ EXTRA_CCOPTIONS       +=      -DSPRO_V2
 EXTRA_C++OPTIONS =     +p +w $(SPRO_V3_OPTIONS)
 MT_LIBS                =       -i $(C++_LIB)  -lm -lw -lc
 
-SYS_LIBRARIES  =       -lintl -lnsl $(MT_LIBS) -lC
+SYS_LIBRARIES  =       -lintl -lnsl $(MT_LIBS)
 #endif /* SunArchitecture */
 
 SRCS = main.C message.C mailbox.C utils.C
index 6503d44e3f515b9bc5b2ca626fbd9fd49f4eaac4..566298b4030601c71001b560035d46bc20909500 100644 (file)
@@ -26,6 +26,9 @@
 
 #include <stdio.h>
 #include <stdarg.h>
+#if defined(sun)
+#include <iconv.h>
+#endif
 #include <sys/stat.h>
 /*#include <nl_types.h>*/
 #include <DtMail/DtMailError.hh>
@@ -893,7 +896,7 @@ class DtMail {
            void *                      _cb_data;
            void *                      _obj_mutex;
        };
-    
+
   private:
     
 friend class MailBox;
@@ -911,4 +914,13 @@ friend class Session;
                        DTMailError_t minor_code);
 };
 
+#if defined(sun)
+template <typename T>
+size_t iconv (iconv_t i, const T inbuf, size_t* inleft,
+              char** outbuf, size_t* outleft)
+{
+    return iconv(i, const_cast<T>(inbuf), inleft, outbuf, outleft);
+};
+#endif
+
 #endif
index 266df2c164e64be8b9d3aecb4159d6beee5e6430..59fe0bdcfda92446f6f9c73ef680d9cbeb90f8d7 100644 (file)
@@ -8,7 +8,7 @@ XCOMM $TOG: Imakefile /main/10 1998/11/09 18:30:37 mgreess $
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
 #include <Threads.tmpl>
 
index dda75020a6fa74f659b772d708fbebee03867040..410ea57ececb5c293bb9f4412b13fc1f8c1d9a97 100644 (file)
@@ -8,7 +8,7 @@ XCOMM $TOG: Imakefile /main/8 1998/08/05 13:25:32 mgreess $
 #define LibCreate      NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
 #include <Threads.tmpl>
 
index 9696424e04ffc2700bd5edcfb5d9bc97c320005e..91bc8ec394a2aaef7b28ad55813043b8bd272eb6 100644 (file)
@@ -578,7 +578,7 @@ RFCMailBox::alterPageMappingAdvice(MapRegion *map, int advice)
   for (int m = 0; m < me; m++) {
     MapRegion *map_t = _mappings[m];
 
-#if !defined(USL) && !defined(__uxp__) && !defined(linux)
+#if !defined(USL) && !defined(__uxp__) && !defined(linux) && !defined(sun)
     // no madvise on these systems
     if (map_t == map || map == (MapRegion *)-1)
       madvise(map_t->map_region, (size_t) map_t->map_size, advice);
@@ -2261,7 +2261,7 @@ RFCMailBox::parseFile(DtMailEnv & error, int map_slot)
     //
     unsigned long pagelimit = _mappings[map_slot]->map_size;
 
-#if !defined(USL) && !defined(__uxp__) && !defined(linux)
+#if !defined(USL) && !defined(__uxp__) && !defined(linux) && !defined(sun)
     // no madvise; dont use optimization
     madvise(
        (char *)_mappings[map_slot]->map_region,
@@ -2352,7 +2352,7 @@ RFCMailBox::parseFile(DtMailEnv & error, int map_slot)
     // At this point we most likely will see random behavior. We will
     // tell the kernel to pull in the minimum number of extra pages.
     //
-#if !defined(USL) && !defined(__uxp__) && !defined(linux)
+#if !defined(USL) && !defined(__uxp__) && !defined(linux) && !defined(sun)
     // no madvise; dont use optimization
     madvise(
        (char *)_mappings[map_slot]->map_region,
index c4affc35ee634fe59772b7b2344d7145f95347e0..600b2b65dafbc71febd7dd24739b31dfd404108d 100644 (file)
@@ -1,5 +1,6 @@
 XCOMM $XConsortium: Imakefile /main/11 1996/09/14 15:16:29 drk $
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = -DDT_LITE -DWORDWRAP -UNLS16
 
 DEPLIBS = DepDtClientLibs
index 1c8ff0c15bcc3e989acb48f692179556796056bd..f990a9cd47d56bd5e937a191431d0d9f4bc655a8 100644 (file)
@@ -5,6 +5,7 @@ XCOMM $XConsortium: Imakefile /main/7 1996/10/09 14:13:27 drk $
  * USE_libraryname in LOCAL_LIBRARIES is by default empty.
  * It should be set when necessary to the real library macro name.
  */
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" -DI18N_MSG
 INCLUDES = -I.
 
@@ -26,7 +27,7 @@ SYS_LIBRARIES = -lmsaa -liconv
 #endif
 
 #if defined (SunArchitecture)
-SYS_LIBRARIES = -lintl -lm -lgen -ldl -lC
+SYS_LIBRARIES = -lintl -lm -lgen -ldl
 #endif
 
 PROGRAMS = dtpdm
index a99fe4b67537650a197c7f02724bf004054f73a5..2c437e7630c5d8d9b9e0e5eccfed468b90938b56 100644 (file)
@@ -8,7 +8,7 @@ XCOMM $XConsortium: Imakefile /main/4 1996/04/21 19:52:09 drk $
 #define LibInstall     NO
  
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
 INCLUDES = -I. -I..
 
index 60f953a044232ae4a46eb7f3f31e9a35c6761bf8..0db9310532150f83c602363fe07c91397a565624 100644 (file)
@@ -1,7 +1,7 @@
 XCOMM $TOG: Imakefile /main/14 1998/08/05 13:21:24 mgreess $
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
 
 INCLUDES = -I. -I../libCliSrv
index e9ac99fa36d437784767853f66f05763f90ed22d..253ae3bb0592f274e9cbe0952f4e331c252d393f 100644 (file)
@@ -31,7 +31,7 @@
 
 #include "Options.h"
 #include <stdlib.h>
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <iostream>
 #else
 #include <iostream.h>
index 4d73aba24166f36db8e997f25d1b4e0e2ba362e0..01a446ea76d227c86a8a12514d3fe65ef81b2eb7 100644 (file)
@@ -75,7 +75,7 @@
 #include "dtappgather.h"
 #include "DirIterator.h"
 #include <stdlib.h>
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <iostream>
 #else
 #include <iostream.h>
index 4e54ecc52e426a7823c2fc721f718262a22518ee..8801e865ee8508c565de2d783e53f13fc7038e05 100644 (file)
@@ -1,7 +1,7 @@
 XCOMM $TOG: Imakefile /main/15 1998/08/05 13:21:49 mgreess $
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
 
 INCLUDES = -I. -I../libCliSrv
index 386466ca618fdd79e16a8cf9bd0db49f0ffc80d6..d6a150107a5d1cfa0adcd82539414e41e09f1e89 100644 (file)
@@ -136,7 +136,7 @@ void ManSearchPath::Print()
     }
 }
 
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 std::ostream & operator<< 
        (
        std::ostream & os, 
@@ -150,7 +150,7 @@ ostream & operator<<
        )
 #endif
 {
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
     os << sp.GetEnvVar() << std::endl;
 #else
     os << sp.GetEnvVar() << endl;
index 9565353cfd8e6cab2be051e4c7c99f6fcce97ad8..b816013fa2ea7de4e7fb877d620b6388d94d3c2d 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "Options.h"
 #include <stdlib.h>
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <iostream>
 #else
 #include <iostream.h>
index 812922df1668f9c5818a6103c5554b43e29a4048..590c5da7269daa8333787bffb8d7309e4610ede5 100644 (file)
@@ -387,7 +387,7 @@ void SearchPath::Print()
  *
  ****************************************************************/
 
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 void SearchPath::PrettyPrint
        (
        std::ostream & os
@@ -402,14 +402,14 @@ void SearchPath::PrettyPrint
     CTokenizedString path (GetSearchPath(), Separator().data());
     CString subpath = path.next();
     while (!subpath.isNull()) {
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
        os << "        " << subpath << std::endl;
 #else
        os << "        " << subpath << endl;
 #endif
        subpath = path.next();
     }
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
     os << std::endl;
 #else
     os << endl;
@@ -424,7 +424,7 @@ void SearchPath::PrettyPrint
  *
  ****************************************************************/
 
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 std::ostream & operator<< 
        (
        std::ostream & os, 
@@ -438,7 +438,7 @@ ostream & operator<<
        )
 #endif
 {
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
     os << sp.GetEnvVar() << "SEARCHPATH:" << std::endl;
 #else
     os << sp.GetEnvVar() << "SEARCHPATH:" << endl;
index ea5cc308209e4ee225f9e237f93c0a2460909204..669c1ddc3c4dada35065b08d95f31a29180dcf48 100644 (file)
@@ -34,7 +34,7 @@
 
 #include "Environ.h"
 #include "cstring.h"
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <iostream>
 #else
 #include <iostream.h>
@@ -51,7 +51,7 @@ class SearchPath {
   virtual void Print();
   virtual void AddPredefinedPath();
 
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
   virtual void PrettyPrint (std::ostream &) const;
 
   friend std::ostream & operator<< (std::ostream &, const SearchPath &);
@@ -186,7 +186,7 @@ class ManSearchPath : public SearchPath {
   virtual void    ExportPath ();
   virtual void    Print();
 
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
   friend std::ostream & operator<< (std::ostream &, const ManSearchPath &);
 #else
   friend ostream & operator<< (ostream &, const ManSearchPath &);
index 83cd42f1ecf6b2917546e3421ad45399f7d5def1..c844ed5aa7c4e4583714a3ea9a77521c7e4b9e4c 100644 (file)
@@ -8,13 +8,13 @@ XCOMM $TOG: Imakefile /main/5 1998/08/05 13:22:12 mgreess $
 #define LibInstall     NO
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
 INCLUDES = -I.
 
 #ifdef SunArchitecture
 SYS_LIBRARIES = -ldl -lintl
-LAST_LOAD_FLAGS = -Bstatic -lC -Bdynamic -lm -lc -ladm -Bstatic
+LAST_LOAD_FLAGS = -Bstatic -Bdynamic -lm -lc -ladm -Bstatic
 EXTRA_DEFINES = -DIOSTREAMSWORKS
 #endif
 
index d55efac71d1792aaae98e362b9b6c64ec6b94443..c8fabfcc99cf9dd04a04f5f69e61d6cacd0ec477 100644 (file)
@@ -95,7 +95,7 @@ TTFile & TTFile::operator=
     return *this;
 }
 
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 std::ostream & operator<<
        (
        std::ostream & os,
@@ -110,7 +110,7 @@ ostream & operator<<
 #endif
 {
     if (file.ttFileOpFailed())
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
        return os << "Error in filename mapping; status = " 
                  << file.getStatus() << std::endl;
 #else
@@ -118,7 +118,7 @@ ostream & operator<<
                  << file.getStatus() << endl;
 #endif
     else
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
        return os << file.data() << std::endl;
 #else
        return os << file.data() << endl;
index 67f3f79e3f83b62bb6e9e0c2c0cc5e53e2de8811..e9ee55d4273a9f7df2454f72b642e784ceb6091c 100644 (file)
@@ -65,7 +65,7 @@ class TTFile : public CString {
   };
 #else
   void TT_Exception (char *);
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
   friend std::ostream & operator<< (std::ostream &, TTFile &);
 #else
   friend ostream & operator<< (ostream &, TTFile &);
index d2f3d5abd6926fb41f90906d3e87989d65009b3f..add17bfe6d688df01769c6bee056fdd8191bf94b 100644 (file)
@@ -37,7 +37,7 @@
 #endif
 #include <stdlib.h>
 #include <string.h>
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <iostream>
 #else
 #include <iostream.h>
index da5e5b0561e82d090697c52a747f162b3565f804..2b1cd900f23b09ab671e2b1e64465d394457f773 100644 (file)
@@ -566,7 +566,7 @@ int i;
     }
 }
 
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 std::ostream & operator<<
        (
        std::ostream &       os,
index 8133f7f699e190948568743cb4ad1de2042f2955..e79bc1ca8f4328a683177e81b62b9c1ae6b674c0 100644 (file)
@@ -32,7 +32,7 @@
 #ifndef _CSTRING_H_
 #define _CSTRING_H_
 
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <iostream>
 #else
 #include <iostream.h>
@@ -72,7 +72,7 @@ class CString {
   int       isNull() const;
   void      replace (const CString &, const CString &);
 
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
   friend std::ostream & operator<< (std::ostream &, const CString &);
 #else
   friend ostream & operator<< (ostream &, const CString &);
index a13f605871abe2fe7f7f31c16c2f64702cf41e09..8da6ce00a88159ca36f244db38a6f7b1b5c1b1b1 100644 (file)
@@ -1,7 +1,8 @@
 XCOMM $TOG: Imakefile /main/22 1998/04/06 13:33:41 mgreess $
 
-        DEFINES = -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
-                  -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\"
+DEPEND_DEFINES = $(DEPENDDEFINES)
+DEFINES = -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
+          -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\"
 
 #if defined(SunArchitecture)
 DEPLIBS = $(DEPDTWIDGETLIB) $(DEPDTSVCLIB) $(DEPTTLIB) \
index 5269b657a05fae7371c20c987beb1433c1492f2a..4f54ecec11a5ae5c4bac9f87619e7b62084b9c08 100644 (file)
@@ -1,9 +1,9 @@
 XCOMM $XConsortium: Imakefile /main/8 1996/09/14 15:25:06 drk $
 
-        DEFINES = -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
-                  -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\"
-
-       INCLUDES = -I. -I$(DTHELPSRC)/..
+DEPEND_DEFINES = $(DEPENDDEFINES)
+DEFINES = -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
+          -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\"
+INCLUDES = -I. -I$(DTHELPSRC)/..
 
 DEPLIBS = DepDtClientLibs
 LOCAL_LIBRARIES = DtClientLibs
index de00d2e2f1a4ca28657544186bd924cf3bcaac31..af4afe063e51e47a663e3c5a47362df3cdd3018d 100644 (file)
@@ -11,6 +11,7 @@ SUBDIRS = util
 MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = $(ARCHITECTURE_DEFINES) -DSUN_TERMINAL_SERVER
 
 #ifdef Build_HpVue
index 82803706f1038fc2a3d86bff02fe0fb16bca020f..4b1c8a1406157b6ff8baec266f9aa181f7cde38e 100644 (file)
@@ -29,6 +29,7 @@ FALOPT1       = -DDTUDCFONTPATH='"'$(XFONTDIR)/misc'"'
         OPT2 = -DFONTC='"'$(BINDIR)/bdftopcf'"'
 #endif
 
+       DEPEND_DEFINES = $(DEPENDDEFINES)
         DEFINES       = $(FALOPT1) $(FALOPT2) $(OPT2) $(FALOPT3)
 
       UDC_INC_PATH1   = -I./include
index b46fe1c5aa728a9109d061001c3cbf0ab2c33bb3..fa10741f9fd02ce82a6156f2938ce0c770c28cd7 100644 (file)
@@ -11,6 +11,7 @@ MWMDEFINES = $(VFORK_DEFINE) -DLARGECURSORS -DR2_COMPAT -DOPAQUE -DSHAPE \
 
 DTWMDEFINES = -DWSM -DPANELIST
 
+DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = $(MWMDEFINES) $(DTWMDEFINES) -DMULTIBYTE -DMINIMAL_DT
 
 DEPLIBS = DepDtClientLibs
@@ -21,12 +22,6 @@ SYS_LIBRARIES = DtClientSysLibs DtClientExtraLibs
 EXTRA_DEFINES = -D_HPUX_SOURCE 
 #endif /* HPArchitecture */    
 
-#if defined (SunArchitecture)
-/* The OpenWindows AllPlanes extension is not in vanilla X11R6. */
-EXTRA_CCOPTIONS = -xF
-dtwm := LOCAL_LDFLAGS = -M mapfile.reorder
-#endif
-
 SRCSXM = \
         WmCDInfo.c      WmCDecor.c      WmCEvent.c \
         WmCPlace.c      WmColormap.c    WmError.c \
index 8ef858201746222e3c3147ec8de9b434c2c5da5e..4ea031397750899b4f86962e2c06f71d187772c7 100644 (file)
@@ -109,7 +109,8 @@ static unsigned int GetEventInverseMask(XEvent *event);
 
 #ifdef WSM
 
-#if (defined(USL) || defined(__uxp__) || defined(linux) || defined(CSRG_BASED)) && !defined(_NFILE)
+#if (defined(USL) || defined(__uxp__) || defined(linux) || \
+     defined(sun) || defined(CSRG_BASED)) && !defined(_NFILE)
 #define _NFILE FOPEN_MAX
 #endif
 #define CLOSE_FILES_ON_EXEC() \
index 6a47eafc8c07a7d476032539bf515ef28eefe7d2..466f0c337d78e9eea3a6494b7daf5c43e5ea8971 100644 (file)
@@ -1083,7 +1083,11 @@ void WmCvtStringToKFocus (XrmValue *args, Cardinal numArgs, XrmValue *fromVal, X
 
     if (!fHit)
     {
+#if defined(sun)
+       cval =  KEYBOARD_FOCUS_POINTER;
+#else
        cval =  KEYBOARD_FOCUS_EXPLICIT;
+#endif
     }
 
 
index 59eaa0fb4a6ca38e3858543bbbdf6065d52ba7c5..8a03160f4455f9e22fc8f8d4b0885a6298f3fe5b 100644 (file)
@@ -852,7 +852,11 @@ XtResource wmGlobalResources[] =
        sizeof (int),
         XtOffsetOf(WmGlobalData, keyboardFocusPolicy),
        XtRImmediate,
+#if defined(sun)
+       (XtPointer)KEYBOARD_FOCUS_POINTER
+#else
        (XtPointer)KEYBOARD_FOCUS_EXPLICIT
+#endif
     },
 
     {
index a6357d112b85432782de36e449ebac9ba2c581fe..4b134464aac962e256eeaa6cbd6f1cc9c04185a2 100644 (file)
 "-dt-application-medium-r-normal-serif-14-140-75-75-p-74-iso8859-1" "-adobe-times-medium-r-normal--14-140-75-75-p-74-iso8859-1"
 "-dt-application-medium-r-normal-serif-18-180-75-75-p-94-iso8859-1" "-adobe-times-medium-r-normal--18-180-75-75-p-94-iso8859-1"
 "-dt-application-medium-r-normal-serif-24-240-75-75-p-124-iso8859-1" "-adobe-times-medium-r-normal--24-240-75-75-p-124-iso8859-1"
-"-dt-interface system-medium-r-normal-xxs sans-10-100-72-72-p-59-iso8859-1" "-b&h-lucida sans-medium-r-normal-sans-10-100-72-72-p-59-iso8859-1"
-"-dt-interface system-medium-r-normal-xs sans-12-120-72-72-p-71-iso8859-1" "-b&h-lucida sans-medium-r-normal-sans-12-120-72-72-p-71-iso8859-1"
-"-dt-interface system-medium-r-normal-s sans-14-140-72-72-p-82-iso8859-1" "-b&h-lucida sans-medium-r-normal-sans-14-140-72-72-p-82-iso8859-1"
-"-dt-interface system-medium-r-normal-m sans-17-170-72-72-p-97-iso8859-1" "-b&h-lucida sans-medium-r-normal-sans-17-170-72-72-p-97-iso8859-1"
-"-dt-interface system-medium-r-normal-l sans-18-180-72-72-p-106-iso8859-1" "-b&h-lucida sans-medium-r-normal-sans-18-180-72-72-p-106-iso8859-1"
-"-dt-interface system-medium-r-normal-xl sans-20-200-72-72-p-114-iso8859-1" "-b&h-lucida sans-medium-r-normal-sans-20-200-72-72-p-114-iso8859-1"
-"-dt-interface system-medium-r-normal-xxl sans-24-240-72-72-p-137-iso8859-1" "-b&h-lucida sans-medium-r-normal-sans-24-240-72-72-p-137-iso8859-1"
-"-dt-interface user-bold-r-normal-xxs sans-8-80-72-72-m-50-iso8859-1" "-b&h-lucida sans typewriter-bold-r-normal-sans-8-80-72-72-m-50-iso8859-1"
-"-dt-interface user-bold-r-normal-xs sans-10-100-72-72-m-60-iso8859-1" "-b&h-lucida sans typewriter-bold-r-normal-sans-10-100-72-72-m-60-iso8859-1"
-"-dt-interface user-bold-r-normal-s sans-12-120-72-72-m-70-iso8859-1" "-b&h-lucida sans typewriter-bold-r-normal-sans-12-120-72-72-m-70-iso8859-1"
-"-dt-interface user-bold-r-normal-m sans-14-140-72-72-m-90-iso8859-1" "-b&h-lucida sans typewriter-bold-r-normal-sans-14-140-72-72-m-90-iso8859-1"
-"-dt-interface user-bold-r-normal-l sans-17-170-72-72-m-100-iso8859-1" "-b&h-lucida sans typewriter-bold-r-normal-sans-17-170-72-72-m-100-iso8859-1"
-"-dt-interface user-bold-r-normal-xl sans-20-200-72-72-m-120-iso8859-1" "-b&h-lucida sans typewriter-bold-r-normal-sans-20-200-72-72-m-120-iso8859-1"
-"-dt-interface user-bold-r-normal-xxl sans-24-240-72-72-m-145-iso8859-1" "-b&h-lucida sans typewriter-bold-r-normal-sans-24-240-72-72-m-145-iso8859-1"
-"-dt-interface user-medium-r-normal-xxs sans-8-80-72-72-m-50-iso8859-1" "-b&h-lucida sans typewriter-medium-r-normal-sans-8-80-72-72-m-50-iso8859-1"
-"-dt-interface user-medium-r-normal-xs sans-10-100-72-72-m-60-iso8859-1" "-b&h-lucida sans typewriter-medium-r-normal-sans-10-100-72-72-m-60-iso8859-1"
-"-dt-interface user-medium-r-normal-s sans-12-120-72-72-m-70-iso8859-1" "-b&h-lucida sans typewriter-medium-r-normal-sans-12-120-72-72-m-70-iso8859-1"
-"-dt-interface user-medium-r-normal-m sans-14-140-72-72-m-90-iso8859-1" "-b&h-lucida sans typewriter-medium-r-normal-sans-14-140-72-72-m-90-iso8859-1"
-"-dt-interface user-medium-r-normal-l sans-17-170-72-72-m-100-iso8859-1" "-b&h-lucida sans typewriter-medium-r-normal-sans-17-170-72-72-m-100-iso8859-1"
-"-dt-interface user-medium-r-normal-xl sans-20-200-72-72-m-120-iso8859-1" "-b&h-lucida sans typewriter-medium-r-normal-sans-20-200-72-72-m-120-iso8859-1"
-"-dt-interface user-medium-r-normal-xxl sans-24-240-72-72-m-145-iso8859-1" "-b&h-lucida sans typewriter-medium-r-normal-sans-24-240-72-72-m-145-iso8859-1"
+"-dt-interface system-medium-r-normal-xxs sans-10-100-72-72-p-61-iso8859-1"  "-adobe-helvetica-medium-r-normal--10-*-75-75-p-56-iso8859-1"
+"-dt-interface system-medium-r-normal-xs sans-11-110-72-72-p-64-iso8859-1"   "-adobe-helvetica-medium-r-normal--11-80-100-100-p-56-iso8859-1"
+"-dt-interface system-medium-r-normal-s sans-12-120-72-72-p-73-iso8859-1"    "-adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1"
+"-dt-interface system-medium-r-normal-m sans-13-130-72-72-p-87-iso8859-1"    "-adobe-helvetica-medium-r-normal--14-140-75-75-p-77-iso8859-1"
+"-dt-interface system-medium-r-normal-l sans-15-150-72-72-p-100-iso8859-1"   "-adobe-helvetica-medium-r-normal--14-140-75-75-p-77-iso8859-1"
+"-dt-interface system-medium-r-normal-xl sans-18-180-72-72-p-114-iso8859-1"  "-adobe-helvetica-medium-r-normal--18-180-75-75-p-98-iso8859-1"
+"-dt-interface system-medium-r-normal-xxl sans-21-210-72-72-p-123-iso8859-1" "-adobe-helvetica-medium-r-normal--20-140-100-100-p-100-iso8859-1"
+"-dt-interface user-bold-r-normal-xxs sans-8-80-72-72-m-50-iso8859-1" "-b&h-lucidatypewriter-bold-r-normal-sans-8-80-72-72-m-50-iso8859-1"
+"-dt-interface user-bold-r-normal-xs sans-10-100-72-72-m-60-iso8859-1" "-b&h-lucidatypewriter-bold-r-normal-sans-10-100-72-72-m-60-iso8859-1"
+"-dt-interface user-bold-r-normal-s sans-12-120-72-72-m-70-iso8859-1" "-b&h-lucidatypewriter-bold-r-normal-sans-12-120-72-72-m-70-iso8859-1"
+"-dt-interface user-bold-r-normal-m sans-14-140-72-72-m-90-iso8859-1" "-b&h-lucidatypewriter-bold-r-normal-sans-14-140-72-72-m-90-iso8859-1"
+"-dt-interface user-bold-r-normal-l sans-17-170-72-72-m-100-iso8859-1" "-b&h-lucidatypewriter-bold-r-normal-sans-17-170-72-72-m-100-iso8859-1"
+"-dt-interface user-bold-r-normal-xl sans-20-200-72-72-m-120-iso8859-1" "-b&h-lucidatypewriter-bold-r-normal-sans-20-200-72-72-m-120-iso8859-1"
+"-dt-interface user-bold-r-normal-xxl sans-24-240-72-72-m-145-iso8859-1" "-b&h-lucidatypewriter-bold-r-normal-sans-24-240-72-72-m-145-iso8859-1"
+"-dt-interface user-medium-r-normal-xxs sans-8-80-72-72-m-50-iso8859-1" "-b&h-lucidatypewriter-medium-r-normal-sans-8-80-72-72-m-50-iso8859-1"
+"-dt-interface user-medium-r-normal-xs sans-10-100-72-72-m-60-iso8859-1" "-b&h-lucidatypewriter-medium-r-normal-sans-10-100-72-72-m-60-iso8859-1"
+"-dt-interface user-medium-r-normal-s sans-12-120-72-72-m-70-iso8859-1" "-b&h-lucidatypewriter-medium-r-normal-sans-12-120-72-72-m-70-iso8859-1"
+"-dt-interface user-medium-r-normal-m sans-14-140-72-72-m-90-iso8859-1" "-b&h-lucidatypewriter-medium-r-normal-sans-14-140-72-72-m-90-iso8859-1"
+"-dt-interface user-medium-r-normal-l sans-17-170-72-72-m-100-iso8859-1" "-b&h-lucidatypewriter-medium-r-normal-sans-17-170-72-72-m-100-iso8859-1"
+"-dt-interface user-medium-r-normal-xl sans-20-200-72-72-m-120-iso8859-1" "-b&h-lucidatypewriter-medium-r-normal-sans-20-200-72-72-m-120-iso8859-1"
+"-dt-interface user-medium-r-normal-xxl sans-24-240-72-72-m-145-iso8859-1" "-b&h-lucidatypewriter-medium-r-normal-sans-24-240-72-72-m-145-iso8859-1"
index b2b57c25b1eff4e8ec886ddfdeeccef504f4611c..b930fc61ad7d9b1fc6e25ba0aeab2feff6d87857 100644 (file)
@@ -1917,7 +1917,7 @@ $ Message 10040 - an error message when the file the user provided the Tar
 $    action is not a folder. Don't translate %(File)Arg_1%, it will be
 $    the bad file name when the message is shown to the user.
 $ 
-10040 ERROR: '%(File)Arg_1%' is not a folder.
+10040 ERROR: \\\"%(File)Arg_1%\\\" is not a folder.
 $ 
 $ Messsages 10041 and 10042 are status messages for the user.  These are
 $    shown to the user when the Tar action is creating the tarball.
index 1de2f7f68ea589f1770c9a56c346ca9d583263f9..a4f533fddb8703e99ed63dbf55df98553f6f9053 100644 (file)
@@ -2143,7 +2143,7 @@ $    action is not a folder. Don't translate %(File)Arg_1%, it will be
 $    the bad file name when the message is shown to the user.
 $ 
 
-10040 "FEHLER: '%(File)Arg_1%' ist kein Ordner."
+10040 "FEHLER: \\\"%(File)Arg_1%\\\" ist kein Ordner."
 $ 
 $ Messsages 10041 and 10042 are status messages for the user.  These are
 $    shown to the user when the Tar action is creating the tarball.
index 741f98437d5db4202f82eb7beed99e3b731c1755..39dfc7939a531514c6b5076eafcdd6dc2ef154a0 100644 (file)
@@ -2154,7 +2154,7 @@ $    action is not a folder. Don't translate %(File)Arg_1%, it will be
 $    the bad file name when the message is shown to the user. 
 $  
 
-10040 "ERROR: '%(File)Arg_1%' no es una carpeta."
+10040 "ERROR: \\\"%(File)Arg_1%\\\" no es una carpeta."
 $  
 $ Messsages 10041 and 10042 are status messages for the user.  These are 
 $    shown to the user when the Tar action is creating the tarball. 
index 633bca336286d6b4ac7c2e1fc5a8b1e0d07aff13..02e6ceec3e7da4f83e03a946864cdef297a24298 100644 (file)
@@ -2108,7 +2108,7 @@ $    action is not a folder. Don't translate %(File)Arg_1%, it will be
 $    the bad file name when the message is shown to the user.
 $ 
 
-10040 "ERREUR: '%(File)Arg_1%' n'est pas un dossier."
+10040 "ERREUR: \\\"%(File)Arg_1%\\\" n'est pas un dossier."
 $ 
 $ Messsages 10041 and 10042 are status messages for the user.  These are
 $    shown to the user when the Tar action is creating the tarball.
index 4ba7cbcbce727c58b587f346d16ec60de046b525..15a042bb8da9b0f2c3ed4ba8539958750b801cae 100644 (file)
@@ -58,7 +58,7 @@
 
 #include "ConsoleOutput.h"
 
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <iostream>
 #include <fstream>
 using namespace std;
@@ -292,7 +292,7 @@ Boolean CmdLineApp::openFilebufWrite(filebuf &file,
     return 0;
   return file.attach(fd) != 0;
 #else
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
   return file.open(filename, ios::out|ios::trunc) != 0;
 #else
   return file.open(filename, ios::out|ios::trunc|IOS_BINARY) != 0;
index 45d505f133a022d47673b386dbf009331a2ea30b..ca0621bf4489c564518fde23aefd7ec4b54b5a6e 100644 (file)
@@ -43,7 +43,7 @@
 #include <stddef.h>
 #endif
 
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <fstream>
 using namespace std;
 #else
index 6f9e520740d539afe9d9729431b2f4c17f6cec91..14994a77731f45d6d7202ada585b4a088ef578b3 100644 (file)
@@ -33,7 +33,7 @@
 #ifdef SP_SHORT_HEADERS
 #include <strstrea.h>
 #else
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <strstream>
 #else
 #include <strstream.h>
@@ -82,7 +82,7 @@ String<char> OutputCodingSystem::convertOut(const StringC &str) const
   encoder->output(copy.data(), copy.size(), &stream);
   delete encoder;
   char *s = stream.str();
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
   String<char> result(s, stream.pcount());
 #else
   String<char> result(s, stream.out_waiting());
index 62adbd0cce1b443ffc9384d55938a71051d830e0..d653a4767452a7b2d8db32288982221ad7e7833f 100644 (file)
@@ -41,7 +41,7 @@
 
 #include <stddef.h>
 
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <streambuf>
 using namespace std;
 #else
index 99ecf24f7db15ecfc5d121f6ab18c24d642bac51..2632dc53f869f02e8dee46db60f16ec9e0acb8f4 100644 (file)
@@ -29,7 +29,7 @@
 #ifdef SP_MULTI_BYTE
 
 #include "EUCJPCodingSystem.h"
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <iostream>
 #else
 #include <iostream.h>
index 25dfd2c1b29f6997ff3e5000a4eec51fcb225c41..0cf3cc51bdabcd25bf53084de7f10c4d66bec3b7 100644 (file)
@@ -34,7 +34,7 @@
 #include "Fixed2CodingSystem.h"
 #include "macros.h"
 
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <iostream>
 #else
 #include <iostream.h>
index cd1b070af98e853ba6c51b98958d932d88487277..490e7307fb7dc514f9ed3a3cb75e6827cc2cc9aa 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "splib.h"
 #include "IdentityCodingSystem.h"
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <iostream>
 #else
 #include <iostream.h>
index 206d546e40092ae914bbcec8050d84d5184b1cf8..c1a523bce774797f4778c108d170daf6bdb2211d 100644 (file)
@@ -1,6 +1,6 @@
 XCOMM $TOG: Imakefile /main/13 1998/04/06 13:38:18 mgreess $
 
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
 #include <Library.tmpl>
 
index 1739437a3e38707333fca9b9d6becdd613f67bc1..20f444fc0c817f1da89ff806758cca5bd7834217 100644 (file)
@@ -28,7 +28,7 @@
 #include "OutputCharStream.h"
 #include "CodingSystem.h"
 #include "macros.h"
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <iostream>
 #else
 #include <iostream.h>
@@ -148,7 +148,7 @@ void IosOutputCharStream::flush()
     encoder_->output(buf_, ptr_ - buf_, byteStream_);
     ptr_ = buf_;
   }
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
   byteStream_->pubsync();
 #else
   byteStream_->sync();
index 7551bfd7cf50c8bce1f89955ddaa14c6873d3f2b..6a71a3c4c26e3a9aa3201ba8a7759569166c1f95 100644 (file)
@@ -33,7 +33,7 @@
 #include "Owner.h"
 #include "CodingSystem.h"
 
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <streambuf>
 using namespace std;
 #else
index a2c8edd5705af65e9643027707d405a2cf2bcc69..dc9d4e2dc6d283cfa1f25d03c3af211f226a7d69 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "SJISCodingSystem.h"
 
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <iostream>
 #else
 #include <iostream.h>
index 3fb39a8281bf220fdd67c586597ab1bd96cb67e0..ffd037a50a284b64a63891517d4860c87ea721a4 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "UTF8CodingSystem.h"
 #include "constant.h"
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <iostream>
 #else
 #include <iostream.h>
index 2901063e59252af28498baf86040a46b6bb9da07..36308622aa5809960794cbbe3eda45579e7ac913 100644 (file)
@@ -39,7 +39,7 @@ extern "C" {
   void *memmove(void *, const void *, size_t);
 }
 #endif
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <iostream>
 #else
 #include <iostream.h>
index 2f7bcc9076ead8826e4b176f9716f01c78f4cbba..9870a1822ef462838e6f92536e8443ccd9ca2340 100644 (file)
@@ -30,9 +30,9 @@
 #define SP_INCLUDE_UNISTD_H
 #define SP_POSIX_FILENAMES
 
-#ifdef __GNUG__
+#if defined(__GNUG__) || defined(__SunOS)
 // It's not missing, but it pulls in libg++
-#if !defined(linux) && !defined(CSRG_BASED)
+#if !defined(linux) && !defined(CSRG_BASED) && !defined(sun)
 #define SP_NEW_H_MISSING
 // set_new_handler() has to be declared extern "C"
 #define SP_SET_NEW_HANDLER_EXTERN_C
index f9490f21ebdbfe788b00c1069ce59a9f940b8a88..ad3a2c5d257be3751cf2a3ccfd90d98b5c5965e8 100644 (file)
@@ -38,7 +38,7 @@
 #include "sptchar.h"
 #include "macros.h"
 
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <iostream>
 #include <fstream>
 #else
@@ -84,7 +84,7 @@ public:
                    const AppChar *filename,
                    const StringC &filenameStr,
                    const OutputCodingSystem *,
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
                    ::Messenger *messenger);
 #else
                    Messenger *messenger);
@@ -94,7 +94,7 @@ public:
   void truncateOutput();
   void allLinkTypesActivated();
 private:
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
   ::Messenger *messenger_;
 #else
   Messenger *messenger_;
@@ -248,7 +248,7 @@ XRastEventHandler::XRastEventHandler(SgmlParser *parser,
                                     const AppChar *filename,
                                     const StringC &filenameStr,
                                     const OutputCodingSystem *codingSystem,
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
                                     ::Messenger *messenger)
 #else
                                     ::Messenger *messenger)
index 96596397fd5f5027b0c5970c6580fd0fd66f41ab..8f1bc005dcf1716f6079714b38ae66f84f5efc57 100644 (file)
@@ -39,7 +39,7 @@ void set_new_handler(VFP);
 
 #else /* not SP_NEW_H_MISSING */
 
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <new>
 #else
 #include <new.h>
index ee000a739c7ac78db9d3e53fcdef6f13ab329191..7b6a3bf219367b6b6196a52dd569a72abb42d22d 100644 (file)
@@ -34,7 +34,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <strstream>
 #else
 #include <strstream.h>
index 735609ee493d8146b96aec8c860a1f9085d3fd00..40852de6dfd5cc5335379c409e97477ae172301e 100644 (file)
@@ -40,7 +40,7 @@
  *** Add include files, types, macros, externs, and user functions here.
  ***/
 
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <fstream>
 #include <strstream>
 #else
index bc724a419aa379fa1221c9b147e7f998c5eada51..9cc2c6bc970d5e422d62fc6424900f76a80f0fc8 100644 (file)
@@ -39,7 +39,7 @@
 #include <sys/wait.h>
 #include <Xm/TextF.h>
 
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <fstream>
 #include <strstream>
 #else
index bd7ac28ec7bf282860cee197610d2bf0445f31fb..213bbc49b2c361fc48b86b6a3d28a4c455739549 100644 (file)
@@ -40,7 +40,7 @@
  *** Add include files, types, macros, externs, and user functions here.
  ***/
 
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <strstream>
 #else
 #include <strstream.h>
index aded915a6b2c48adac66ff9cbed8cc2afb0b4734..dd08b3b93deb601647930ca3d0c68daa861daffc 100644 (file)
@@ -40,7 +40,7 @@
  *** Add include files, types, macros, externs, and user functions here.
  ***/
 
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <strstream>
 #else
 #include <strstream.h>
index cc3fde27e89b812cc82e7a48717d5a92f9d012bb..b24b23cfab8f137b14661a1a26e58386a09d2487 100644 (file)
@@ -42,7 +42,7 @@
 
 #include <Xm/TextF.h>
 
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <fstream>
 #include <strstream>
 #else
index daef603120da3835f6762d99f928714579ba041f..c97e3e6611b5c248d4866e390587970091c02485 100644 (file)
@@ -42,7 +42,7 @@
 
 #include <Xm/TextF.h>
 
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <fstream>
 #else
 #include <fstream.h>
index ed0f854a84a9551a361f8dd1f57f721bbe2f0306..5d0d98c4a4a7ab4911bf7a979e7c2a294b1cdd79 100644 (file)
@@ -42,7 +42,7 @@
 
 #include <stdio.h>
 
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <strstream>
 #else
 #include <strstream.h>
index 931b7d884b404683e58676c6ba4240b272f13604..a4ae799b68b73f645b10103f6d915d106507b80e 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef TT_CXX_H
 #define TT_CXX_H
 
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <iostream>
 using namespace std;
 #else
index e5fe8758aa3d8086fdd68470198fd71f9b6f74a2..1d7059bf2580f9ffb57c226e765e038c9c50465d 100644 (file)
@@ -63,7 +63,7 @@
 #include <sys/stat.h>
 #include <time.h>
 
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <iostream>
 #include <strstream>
 #include <fstream>
index 3d093894425633148aa8ae952b0cf4e87b4a228a..0be3fc03393851c7fde9cd5c1265dbb974a66884 100644 (file)
@@ -37,7 +37,7 @@
 
 #include <unistd.h>
 
-#if defined(linux) || defined(CSRG_BASED)
+#if defined(linux) || defined(CSRG_BASED) || defined(sun)
 #include <fstream>
 #include <strstream>
 #else
index 69ece3ef2d58d3690188371455cb4fda3bec7324..59a4c357650596c10b0550684f13cfe64f1f7a76 100644 (file)
@@ -54,7 +54,7 @@ CONTROL Date
   POSITION_HINTS       2
   ICON                 FpCM
   LABEL                 %|nls-18002-#Calendar#|
-  DATE_FORMAT          %|nls-18022-#%b%n%e#|
+  DATE_FORMAT          %b%n%e
   PUSH_ACTION          Dtcm
   PUSH_RECALL          True
   DROP_ACTION          DtcmInsert