Browse Source

FreeBSD 10 clang port

master
Ulrich Wilkens 7 years ago
committed by Jon Trulson
parent
commit
c3f74eec17
  1. 18
      cde/Imakefile
  2. 73
      cde/admin/IntegTools/post_install/Imakefile
  3. 23
      cde/admin/IntegTools/post_install/freebsd/Imakefile
  4. 72
      cde/config/cf/DtInfo.rules
  5. 56
      cde/config/cf/FreeBSD.cf
  6. 59
      cde/config/cf/Imake.rules
  7. 2
      cde/config/cf/Imake.tmpl
  8. 2
      cde/config/cf/Motif.tmpl
  9. 4
      cde/config/cf/NetBSD.cf
  10. 4
      cde/config/cf/bsdLib.tmpl
  11. 2
      cde/config/cf/cde.tmpl
  12. 25
      cde/config/imake/imakemdep.h
  13. 7
      cde/config/makedepend/cppsetup.c
  14. 49
      cde/config/makedepend/ifparser.c
  15. 11
      cde/config/makedepend/main.c
  16. 9
      cde/config/makedepend/parse.c
  17. 45
      cde/databases/Imakefile
  18. 4
      cde/include/EUSCompat.h
  19. 4
      cde/lib/DtHelp/il/ilX.c
  20. 2
      cde/lib/DtHelp/il/ilbigray.c
  21. 4
      cde/lib/DtHelp/il/ilimage.c
  22. 4
      cde/lib/DtHelp/il/ilinvert.c
  23. 8
      cde/lib/DtHelp/il/ilmap.c
  24. 4
      cde/lib/DtHelp/il/ilpalette.c
  25. 4
      cde/lib/DtHelp/il/iltruegray.c
  26. 12
      cde/lib/DtHelp/il/ilycbcr.c
  27. 4
      cde/lib/DtPrint/PrintOptions.c
  28. 2
      cde/lib/DtTerm/TermPrim/TermPrimBuffer.c
  29. 2
      cde/lib/DtTerm/TermPrim/TermPrimParser.c
  30. 8
      cde/lib/csa/Imakefile
  31. 8
      cde/lib/tt/mini_isam/isdatconv.c
  32. 2
      cde/lib/tt/mini_isam/isrepair.c
  33. 2
      cde/programs/dsdm/proxy.c
  34. 4
      cde/programs/dtcm/dtcm/todo.c
  35. 2
      cde/programs/dtcm/dtcm/x_graphics.c
  36. 2
      cde/programs/dticon/image.c
  37. 2
      cde/programs/dticon/utils.c
  38. 3
      cde/programs/dtinfo/DtMmdb/StyleSheet/Expression.C
  39. 4
      cde/programs/dtinfo/DtMmdb/StyleSheet/defToken.C
  40. 4
      cde/programs/dtinfo/DtMmdb/compression/ps.C
  41. 4
      cde/programs/dtinfo/DtMmdb/compression/sgml.C
  42. 1
      cde/programs/dtinfo/DtMmdb/compression/trie.C
  43. 1
      cde/programs/dtinfo/DtMmdb/index/mphf_index.h
  44. 4
      cde/programs/dtinfo/DtMmdb/schema/token.C
  45. 2
      cde/programs/dtinfo/dtinfo/src/Agents/BookmarkEditMotif.hh
  46. 13
      cde/programs/dtinfo/dtinfo/src/Agents/GraphicAgentMotif.C
  47. 1
      cde/programs/dtinfo/dtinfo/src/Agents/GraphicAgentMotif.hh
  48. 2
      cde/programs/dtinfo/dtinfo/src/Agents/LibraryAgentMotif.hh
  49. 4
      cde/programs/dtinfo/dtinfo/src/Agents/MarkCanvas.hh
  50. 3
      cde/programs/dtinfo/dtinfo/src/Agents/MarkIconMotif.C
  51. 1
      cde/programs/dtinfo/dtinfo/src/Agents/MarkIconMotif.hh
  52. 4
      cde/programs/dtinfo/dtinfo/src/Agents/MarkListView.hh
  53. 6
      cde/programs/dtinfo/dtinfo/src/Agents/NodeWindowAgentMotif.C
  54. 8
      cde/programs/dtinfo/dtinfo/src/Agents/NodeWindowAgentMotif.hh
  55. 2
      cde/programs/dtinfo/dtinfo/src/Agents/ScopeMenu.hh
  56. 26
      cde/programs/dtinfo/dtinfo/src/Basic/HashTbl.C
  57. 4
      cde/programs/dtinfo/dtinfo/src/Basic/HashTbl.hh
  58. 1
      cde/programs/dtinfo/dtinfo/src/Managers/EnvMgr.hh
  59. 4
      cde/programs/dtinfo/dtinfo/src/Managers/GlobalHistoryMgr.hh
  60. 2
      cde/programs/dtinfo/dtinfo/src/Managers/LocalHistoryMgr.hh
  61. 2
      cde/programs/dtinfo/dtinfo/src/Managers/MarkMgr.hh
  62. 3
      cde/programs/dtinfo/dtinfo/src/Managers/MessageMgr.C
  63. 1
      cde/programs/dtinfo/dtinfo/src/Managers/MessageMgr.hh
  64. 2
      cde/programs/dtinfo/dtinfo/src/Managers/PrintMgr.C
  65. 1
      cde/programs/dtinfo/dtinfo/src/Managers/PrintMgr.hh
  66. 1
      cde/programs/dtinfo/dtinfo/src/Managers/TtIpcMgr.hh
  67. 2
      cde/programs/dtinfo/dtinfo/src/Marks/Anchor.hh
  68. 12
      cde/programs/dtinfo/dtinfo/src/Marks/Mark.hh
  69. 2
      cde/programs/dtinfo/dtinfo/src/Marks/MarkBase.hh
  70. 1
      cde/programs/dtinfo/dtinfo/src/OnlineRender/CanvasRenderer.C
  71. 1
      cde/programs/dtinfo/dtinfo/src/OnlineRender/CanvasRenderer.hh
  72. 1
      cde/programs/dtinfo/dtinfo/src/Query/QueryTerm.hh
  73. 2
      cde/programs/dtinfo/dtinfo/src/Templates.C
  74. 4
      cde/programs/dtinfo/dtinfo/src/Widgets/Tree.c
  75. 4
      cde/programs/dtinfo/dtinfogen/infolib/etc/ContentType.C
  76. 4
      cde/programs/dtinfo/dtinfogen/infolib/etc/RemoteId.C
  77. 4
      cde/programs/dtinfo/dtinfogen/infolib/etc/ReplaceIdIdref.C
  78. 4
      cde/programs/dtinfo/dtinfogen/infolib/etc/gr_type.C
  79. 4
      cde/programs/dtinfo/dtinfogen/infolib/etc/lex.C
  80. 7
      cde/programs/dtksh/ksh93/src/lib/libast/hash/hashalloc.c
  81. 6
      cde/programs/dtksh/ksh93/src/lib/libast/string/tokscan.c
  82. 2
      cde/programs/dtlogin/choose.c
  83. 16
      cde/programs/dtlogin/chooser.c
  84. 12
      cde/programs/dtlogin/dm.c
  85. 2
      cde/programs/dtlogin/dtchooser.c
  86. 6
      cde/programs/dtlogin/file.c
  87. 4
      cde/programs/dtlogin/fontpath.c
  88. 5
      cde/programs/dtlogin/genauth.c
  89. 2
      cde/programs/dtlogin/protodpy.c
  90. 4
      cde/programs/dtlogin/resource.c
  91. 6
      cde/programs/dtlogin/session.c
  92. 8
      cde/programs/dtlogin/socket.c
  93. 2
      cde/programs/dtlogin/vgmain.c
  94. 2
      cde/programs/dtpad/printSetup.c
  95. 2
      cde/programs/dtstyle/ColorPalette.c
  96. 4
      cde/programs/dtterm/DtTermMain.c
  97. 18
      cde/programs/dtudcfonted/libfal/_fallcGeneric.c
  98. 20
      cde/programs/localized/templates/types.tmpl
  99. 40
      cde/programs/ttsnoop/Imakefile

18
cde/Imakefile

@ -55,11 +55,7 @@ Everything::
@echo ""
@date
@echo ""
cd $(IMAKESRC) && if [ -f Makefile ]; then \
$(MAKE) $(MFLAGS) BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; \
else \
$(MAKE) $(MFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; \
fi
MakeImakeDir()
-$(RM) xmakefile.bak; $(MV) xmakefile xmakefile.bak
$(MAKE) $(MFLAGS) -f xmakefile.bak xmakefile
$(MAKE) $(MFLAGS) $(MAKE_OPTS) Makefiles
@ -82,11 +78,7 @@ Everything.dev::
@echo ""
@date
@echo ""
cd $(IMAKESRC) && if [ -f Makefile ]; then \
$(MAKE) $(MFLAGS) BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; \
else \
$(MAKE) $(MFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; \
fi
MakeImakeDir()
-$(RM) xmakefile.bak; $(MV) xmakefile xmakefile.bak
$(MAKE) $(MFLAGS) -f xmakefile.bak xmakefile
$(MAKE) $(MFLAGS) $(MAKE_OPTS) Makefiles
@ -120,11 +112,7 @@ Everything.doc::
@echo ""
@date
@echo ""
cd $(IMAKESRC) && if [ -f Makefile ]; then \
$(MAKE) $(MFLAGS) BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; \
else \
$(MAKE) $(MFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; \
fi
MakeImakeDir()
-$(RM) xmakefile.bak; $(MV) xmakefile xmakefile.bak
$(MAKE) $(MFLAGS) -f xmakefile.bak xmakefile
$(MAKE) $(MFLAGS) $(MAKE_OPTS) Makefiles.doc

73
cde/admin/IntegTools/post_install/Imakefile

@ -59,65 +59,19 @@ MakeSubdirs($(SUBDIRS))
all::
configHelp:: $(DATABASE_DIR)/CDE-HELP-C.udb
$(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-HELP-C.udb > CDE-HELP-C.lst
$(BUILD_UDB_TOOL) CDE-HELP-C ../../..
configHelpPrg:: $(DATABASE_DIR)/CDE-HELP-PRG.udb
$(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-HELP-PRG.udb > CDE-HELP-PRG.lst
$(BUILD_UDB_TOOL) CDE-HELP-PRG ../../..
configDemos:: $(DATABASE_DIR)/CDE-DEMOS.udb
$(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-DEMOS.udb > CDE-DEMOS.lst
$(BUILD_UDB_TOOL) CDE-DEMOS ../../..
configFonts:: $(DATABASE_DIR)/CDE-FONTS.udb
$(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-FONTS.udb > CDE-FONTS.lst
$(BUILD_UDB_TOOL) CDE-FONTS ../../..
configHelpRun:: $(DATABASE_DIR)/CDE-HELP-RUN.udb
$(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-HELP-RUN.udb > CDE-HELP-RUN.lst
$(BUILD_UDB_TOOL) CDE-HELP-RUN ../../..
configIcons:: $(DATABASE_DIR)/CDE-ICONS.udb
$(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-ICONS.udb > CDE-ICONS.lst
$(BUILD_UDB_TOOL) CDE-ICONS ../../..
configInc:: $(DATABASE_DIR)/CDE-INC.udb
$(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-INC.udb > CDE-INC.lst
$(BUILD_UDB_TOOL) CDE-INC ../../..
configManDev:: $(DATABASE_DIR)/CDE-MAN-DEV.udb
$(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-MAN-DEV.udb > CDE-MAN-DEV.lst
$(BUILD_UDB_TOOL) CDE-MAN-DEV ../../..
configMan:: $(DATABASE_DIR)/CDE-MAN.udb
$(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-MAN.udb > CDE-MAN.lst
$(BUILD_UDB_TOOL) CDE-MAN ../../..
configMsgCat:: $(DATABASE_DIR)/CDE-MSG-C.udb
$(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-MSG-C.udb > CDE-MSG-C.lst
$(BUILD_UDB_TOOL) CDE-MSG-C ../../..
configPrg:: $(DATABASE_DIR)/CDE-PRG.udb
$(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-PRG.udb > CDE-PRG.lst
$(BUILD_UDB_TOOL) CDE-PRG ../../..
configShlibs:: $(DATABASE_DIR)/CDE-SHLIBS.udb
$(UDB_TOOL) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-SHLIBS.udb > CDE-SHLIBS.lst
$(BUILD_UDB_TOOL) CDE-SHLIBS ../../..
DoUDB_SCRIPT3(configHelp,CDE-HELP-C,$(UDB_TOOL),$(BUILD_UDB_TOOL))
DoUDB_SCRIPT3(configHelpPrg,CDE-HELP-PRG,$(UDB_TOOL),$(BUILD_UDB_TOOL))
DoUDB_SCRIPT3(configDemos,CDE-DEMOS,$(UDB_TOOL),$(BUILD_UDB_TOOL))
DoUDB_SCRIPT3(configFonts,CDE-FONTS,$(UDB_TOOL),$(BUILD_UDB_TOOL))
DoUDB_SCRIPT3(configHelpRun,CDE-HELP-RUN,$(UDB_TOOL),$(BUILD_UDB_TOOL))
DoUDB_SCRIPT3(configIcons,CDE-ICONS,$(UDB_TOOL),$(BUILD_UDB_TOOL))
DoUDB_SCRIPT3(configInc,CDE-INC,$(UDB_TOOL),$(BUILD_UDB_TOOL))
DoUDB_SCRIPT3(configManDev,CDE-MAN-DEV,$(UDB_TOOL),$(BUILD_UDB_TOOL))
DoUDB_SCRIPT3(configMan,CDE-MAN,$(UDB_TOOL),$(BUILD_UDB_TOOL))
DoUDB_SCRIPT3(configMsgCat,CDE-MSG-C,$(UDB_TOOL),$(BUILD_UDB_TOOL))
DoUDB_SCRIPT3(configPrg,CDE-PRG,$(UDB_TOOL),$(BUILD_UDB_TOOL))
DoUDB_SCRIPT3(configShlibs,CDE-SHLIBS,$(UDB_TOOL),$(BUILD_UDB_TOOL))
LOCAL_CPP_DEFINES = -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \
-DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
@ -125,7 +79,6 @@ LOCAL_CPP_DEFINES = -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \
CppSourceFile(configHelp,configHelp.src,$(LOCAL_CPP_DEFINES),)
CppSourceFile(configHelpPrg,configHelpPrg.src,$(LOCAL_CPP_DEFINES),)
CppSourceFile(configDemos,configDemos.src,$(LOCAL_CPP_DEFINES),)
CppSourceFile(configFonts,configFonts.src,$(LOCAL_CPP_DEFINES),)
CppSourceFile(configHelpRun,configHelpRun.src,$(LOCAL_CPP_DEFINES),)

23
cde/admin/IntegTools/post_install/freebsd/Imakefile

@ -28,27 +28,14 @@ PLATFORM = uxp
UDBTOANY = $(KORNSHELL) $(TOOL_DIR)/udbToAny.ksh
BUILD_UDB_LIST = $(SHELL) ../build_udb_list
all::
configMin:: $(DATABASE_DIR)/CDE-MIN.udb
$(UDBTOANY) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-MIN.udb > CDE-MIN.lst
$(BUILD_UDB_LIST) CDE-MIN ../../../..
configTT:: $(DATABASE_DIR)/CDE-TT.udb
$(UDBTOANY) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-TT.udb > CDE-TT.lst
$(BUILD_UDB_LIST) CDE-TT ../../../..
all::
configRun:: $(DATABASE_DIR)/CDE-RUN.udb
$(UDBTOANY) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-RUN.udb > CDE-RUN.lst
$(BUILD_UDB_LIST) CDE-RUN ../../../..
DoUDB_SCRIPT4(configMin,CDE-MIN,$(UDBTOANY),$(BUILD_UDB_LIST))
DoUDB_SCRIPT4(configTT,CDE-TT,$(UDBTOANY),$(BUILD_UDB_LIST))
DoUDB_SCRIPT4(configRun,CDE-RUN,$(UDBTOANY),$(BUILD_UDB_LIST))
DoUDB_SCRIPT4(configShlibs,CDE-SHLIBS,$(UDBTOANY),$(BUILD_UDB_LIST))
configShlibs:: $(DATABASE_DIR)/CDE-SHLIBS.udb
$(UDBTOANY) -toLst -ReleaseStream $(PLATFORM) \
$(DATABASE_DIR)/CDE-SHLIBS.udb > CDE-SHLIBS.lst
$(BUILD_UDB_LIST) CDE-SHLIBS ../../../..
LOCAL_CPP_DEFINES = -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \
-DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \

72
cde/config/cf/DtInfo.rules

@ -40,26 +40,26 @@ XCOMM $TOG: DtInfo.rules /main/21 1997/09/05 11:31:01 samborn $
# define makelibT(libname) @@\
makelib(libname) @@\
@@\
libname/lib/**/libname/**/T.a: FRC @@\
Concat3(libname/lib,libname,T.a): FRC @@\
@(cd libname ; \ @@\
echo "### Making lib libname Templates ###" ; \ @@\
$(MAKE) lib/**/libname/**/T.a ; \ @@\
echo STR(*** Making lib libname Templates ***) ; \ @@\
$(MAKE) Concat3(lib,libname,T.a) ; \ @@\
)
# define makelibsubsubdir(subdir,libname) @@\
@@\
subdir/libname/lib/**/libname.a: FRC @@\
Concat(subdir/libname/lib,libname.a): FRC @@\
@(cd subdir ; \ @@\
echo "### Making lib libname ###" ; \ @@\
$(MAKE) libname/lib/**/libname.a ; \ @@\
echo STR(*** Making lib libname ***) ; \ @@\
$(MAKE) Concat(libname/lib,libname.a) ; \ @@\
)
# define makelibTsubsubdir(subdir,libname) @@\
@@\
subdir/libname/lib/**/libname/**/T.a: FRC @@\
Concat3(subdir/libname/lib,libname,T.a): FRC @@\
@(cd subdir ; \ @@\
echo "### Making lib libname Templates ###" ; \ @@\
$(MAKE) libname/lib/**/libname/**/T.a ; \ @@\
echo STR(*** Making lib libname Templates ***) ; \ @@\
$(MAKE) Concat3(libname/lib,libname,T.a) ; \ @@\
)
#else /* not defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3 */
# define makelibT(libname) @@\
@ -70,28 +70,28 @@ subdir/libname/lib/**/libname/**/T.a: FRC @@\
makelibd(libname,)
#define makelibd(libname, deps) @@\
libname/lib/**/libname.a: deps FRC @@\
Concat(libname/lib,libname.a): deps FRC @@\
@(cd libname; \ @@\
echo "### Making lib libname ###" ; \ @@\
$(MAKE) lib/**/libname.a ; \ @@\
if [ -d "$(TEMPLATE_DB)" ]; then \ @@\
$(MAKE) lib/**/libname/**/T.a ; \ @@\
fi \ @@\
echo STR(*** Making lib libname ***) ; \ @@\
$(MAKE) Concat(lib,libname.a) ; \ @@\
if [ -d "$(TEMPLATE_DB)" ]; then \ @@\
$(MAKE) Concat3(lib,libname,T.a) ; \ @@\
fi \ @@\
) @@\
libname/libname.d: libname/Classlist.mk @@\
@(cd libname; \ @@\
echo "### Making dfiles in libname ###" ; \ @@\
$(MAKE) libname.d ;\ @@\
echo STR(*** Making dfiles in libname ***) ; \ @@\
$(MAKE) libname.d ;\ @@\
) @@\
libname/libname.h: libname/Classlist.mk @@\
@(cd libname; \ @@\
echo "### Making dfiles in libname ###" ; \ @@\
$(MAKE) libname.h ;\ @@\
echo STR(*** Making dfiles in libname ***) ; \ @@\
$(MAKE) libname.h ;\ @@\
) @@\
libname/libname.msg: libname/Classlist.mk @@\
@(cd libname; \ @@\
echo "### Making msgs in libname ###" ; \ @@\
$(MAKE) libname.msg ;\ @@\
echo STR(*** Making msgs in libname ***) ; \ @@\
$(MAKE) libname.msg ;\ @@\
) @@\
@@\
FRC: @@\
@ -149,7 +149,7 @@ AllTarget(Concat(lib,libname.a)) @@\
@@\
Concat(lib,libname.a): objlist @@\
$(RM) $@ @@\
@echo "### Making SimpleLibrary libname.a" @@\
@echo STR(*** Making SimpleLibrary libname.a) @@\
$(LD) -r -o $@ objlist
@ -157,11 +157,11 @@ Concat(lib,libname.a): objlist @@\
#define SimpleLibraryT(libname,objlist,libdir) @@\
SimpleLibrary(libname,objlist,libdir) @@\
@@\
AllTarget(Concat(lib,libname/**/T.a)) @@\
AllTarget(Concat3(lib,libname,T.a)) @@\
@@\
Concat(lib,libname/**/T.a): @@\
Concat3(lib,libname,T.a): @@\
$(RM) $@ @@\
@echo "### Making SimpleLibraryT libname Templates" @@\
@echo STR(*** Making SimpleLibraryT libname Templates) @@\
find ./Templates.DB -name '*.o' -type f -print | xargs -n4 ar cq $@ @@\
@@\
clean:: @@\
@ -170,11 +170,11 @@ clean:: @@\
#define SimpleLibraryT(libname,objlist,libdir) @@\
SimpleLibrary(libname,objlist,libdir) @@\
@@\
AllTarget(Concat(lib,libname/**/T.a)) @@\
AllTarget(Concat3(lib,libname,T.a)) @@\
@@\
Concat(lib,libname/**/T.a): TemplateObjs @@\
Concat3(lib,libname,T.a): TemplateObjs @@\
$(RM) $@ @@\
@echo "### Making SimpleLibraryT libname Templates" @@\
@echo STR(*** Making SimpleLibraryT libname Templates) @@\
$(AR) $@ TemplateObjs @@\
@@\
clean:: @@\
@ -186,7 +186,7 @@ AllTarget(Concat(lib,libname.a)) @@\
@@\
Concat(lib,libname.a): objlist @@\
$(RM) $@ @@\
@echo "### Making RealLibrary libname.a" @@\
@echo STR(*** Making RealLibrary libname.a) @@\
ar cq $@ objlist @@\
RanLibrary($@)
@ -195,18 +195,18 @@ AllTarget(Concat(lib,libname.a)) @@\
@@\
Concat(lib,libname.a): objlist otherdeps @@\
$(RM) $@ @@\
@echo "### Making NotSoSimpleLibrary libname.a" @@\
@echo STR(*** Making NotSoSimpleLibrary libname.a) @@\
$(LD) -r -o $@ objlist
#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
#define NotSoSimpleLibraryT(libname,objlist,libdir,otherdeps) @@\
NotSoSimpleLibrary(libname,objlist,libdir,otherdeps) @@\
@@\
AllTarget(Concat(lib,libname/**/T.a)) @@\
AllTarget(Concat3(lib,libname,T.a)) @@\
@@\
Concat(lib,libname/**/T.a): @@\
Concat3(lib,libname,T.a): @@\
$(RM) $@ @@\
@echo "### Making NotSoSimpleLibraryT libname Templates"@@\
@echo STR(*** Making NotSoSimpleLibraryT libname Templates) @@\
find ./Templates.DB -name '*.o' -type f -print | xargs -n4 ar cq $@ @@\
@@\
clean:: @@\
@ -215,11 +215,11 @@ clean:: @@\
#define NotSoSimpleLibraryT(libname,objlist,libdir,otherdeps) @@\
NotSoSimpleLibrary(libname,objlist,libdir,otherdeps) @@\
@@\
AllTarget(Concat(lib,libname/**/T.a)) @@\
AllTarget(Concat3(lib,libname,T.a)) @@\
@@\
Concat(lib,libname/**/T.a): @@\
Concat3(lib,libname,T.a): @@\
$(RM) $@ @@\
@echo "### Making NotSoSimpleLibraryT libname Templates"@@\
@echo STR(*** Making NotSoSimpleLibraryT libname Templates) @@\
$(AR) $@ TemplateObjs @@\
@@\
clean:: @@\

56
cde/config/cf/FreeBSD.cf

@ -15,20 +15,33 @@ XCOMM platform: $TOG: FreeBSD.cf /main/21 1997/10/05 20:42:34 kaleb $
#ifndef OSTeenyVersion
#define OSTeenyVersion DefaultOSTeenyVersion
#endif
XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
XCOMM operating system: OSName (OSMajorVersion/**/./**/OSMinorVersion/**/./**/OSTeenyVersion)
#define HasPutenv YES
#define HasBSD44Sockets YES
#define HasZlib YES
#if OSMajorVersion >= 10 && defined(UseGcc)
USE_GCC = UseGcc
#endif
#ifndef CppCmd
#if OSMajorVersion >= 5
#define CppCmd /usr/bin/cpp -traditional
#define PreProcessCmd /usr/bin/cpp -traditional
#if OSMajorVersion >= 10 && defined(UseGcc)
# define CppCmd /usr/local/bin/cpp$(USE_GCC)
#else
#define CppCmd /usr/libexec/cpp -traditional
#define PreProcessCmd /usr/libexec/cpp -traditional
# define CppCmd /usr/bin/cpp
#endif
#endif
#define PreProcessCmd CppCmd
#if OSMajorVersion >= 10
#define CppArgs -Wno-invalid-pp-token
#else
#define CppArgs /**/
#endif
#ifndef StandardCppDefines
#define StandardCppDefines -traditional CppArgs
#endif
#undef InstallCmd
@ -71,19 +84,33 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#define MkdirHierCmd mkdir -p
#ifndef CcCmd
#define CcCmd gcc
#if OSMajorVersion >= 10
# if defined(UseGcc)
# define CcCmd /usr/local/bin/gcc$(USE_GCC)
# define CplusplusCmd /usr/local/bin/g++$(USE_GCC)
# else
# define CcCmd cc
# define CplusplusCmd c++
# endif
#else
# define CcCmd gcc
# define CplusplusCmd g++
#endif
#endif
#ifndef DefaultCCOptions
#define DefaultCCOptions -pipe
#endif
#endif
#ifndef CplusplusLibC
#define CplusplusLibC -lstdc++
#endif
#if OSMajorVersion > 1
#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
#define XawI18nDefines -DUSE_XWCHAR_STRING
#define HasMakefileSafeInclude YES
#define IncludeMakefile(file) @@# dependencies are in .depend
#define IncludeMakefile(file) HASH_SIGN dependencies are in .depend
#define DependFileName .depend
#if OSMajorVersion < 3
#if OSMinorVersion < 2
@ -148,7 +175,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#endif
#ifndef OptimizedCDebugFlags
# ifdef i386Architecture
# if defined(i386Architecture) || defined(AMD64Architecture)
# define OptimizedCDebugFlags DefaultGcc2i386Opt
# else
# define OptimizedCDebugFlags -O2 -fno-strict-aliasing
@ -156,11 +183,16 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#endif
#ifdef HasGcc2
CXXDEPENDINCLUDE != CppCmd -x c++ -Wp,-v < /dev/null \
2>&1 | sed -n 's/ \(.*[cg]++.*\)/-I\1/p'
CXXDEPENDINCLUDE != CcCmd -v -x c++ /dev/null -fsyntax-only \
2>&1 | sed -n 's/^ \(\/.*[cg]++.*\)/-I\1/p'
#define CplusplusDependIncludes $(CXXDEPENDINCLUDE)
#endif
/* beginning with svn version 254273 iconv functions are moved to libc */
#if (OSMajorVersion >= 10)
ICONVSYSLIB != if test -f /usr/local/include/iconv.h; then echo -liconv; else echo; fi
#endif
#define ServerExtraDefines GccGasOption XFree86ServerDefines
#define StandardDefines -DCSRG_BASED

59
cde/config/cf/Imake.rules

@ -162,6 +162,9 @@ XCOMM rules: $TOG: Imake.rules /main/227 1998/02/02 12:07:57 kaleb $
* CppSourceFile (dst,src,defs,deplist)
* MakeDirectories (step,dirs)
* AllTarget (depends)
* MakeImakeDir ()
* DoUDB_SCRIPT3 (target, file, script, build)
* DoUDB_SCRIPT4 (target, file, script, build)
*
*
* The following are in specific <os>Lib.rules:
@ -175,6 +178,16 @@ XCOMM rules: $TOG: Imake.rules /main/227 1998/02/02 12:07:57 kaleb $
#define NullParameter
/* stringify macro */
#ifndef STR
# if defined(__llvm__)
# define STR2(x) #x
# else
# define STR2(x) "x"
# endif
#define STR(x) STR2(x)
#endif
/* if [ -d ] or [ ! -d ] causes make to fail, define this as - */
#ifndef DirFailPrefix
#define DirFailPrefix
@ -210,7 +223,7 @@ XCOMM special target for clearmake @@\
* Concat - concatenates two strings.
*/
#ifndef Concat
#if (__STDC__ && !defined(UnixCpp)) || defined(AnsiCpp)
#if (__STDC__ && !defined(UnixCpp)) || defined(AnsiCpp) || defined(__llvm__)
#define Concat(a,b)a##b
#else
#define Concat(a,b)a/**/b
@ -221,7 +234,7 @@ XCOMM special target for clearmake @@\
* Concat3 - concatenates three strings.
*/
#ifndef Concat3
#if (__STDC__ && !defined(UnixCpp)) || defined(AnsiCpp)
#if (__STDC__ && !defined(UnixCpp)) || defined(AnsiCpp) || defined(__llvm__)
#define Concat3(a,b,c)a##b##c
#else
#define Concat3(a,b,c)a/**/b/**/c
@ -232,7 +245,7 @@ XCOMM special target for clearmake @@\
* Concat4 - concatenates four strings.
*/
#ifndef Concat4
#if (__STDC__ && !defined(UnixCpp)) || defined(AnsiCpp)
#if (__STDC__ && !defined(UnixCpp)) || defined(AnsiCpp) || defined(__llvm__)
#define Concat4(a,b,c,d)a##b##c##d
#else
#define Concat4(a,b,c,d)a/**/b/**/c/**/d
@ -262,7 +275,7 @@ XCOMM special target for clearmake @@\
* exists to avoid problems with some preprocessors
*/
#ifndef _XUseCat
# if (__STDC__ && !defined(UnixCpp)) || defined(AnsiCpp)
# if (__STDC__ && !defined(UnixCpp)) || defined(AnsiCpp) || defined(__llvm__)
# if defined(UseInstalled) || UseInstalledX11
# define _XUseCat(a,b,c) a##c
# else
@ -2486,6 +2499,44 @@ step:: @@\
all:: depends
#endif /* AllTarget */
/*
* MakeImakeDir - call make in imake directory.
*/
#ifndef MakeImakeDir
#define MakeImakeDir() cd $(IMAKESRC) && \ @@\
if [ -f Makefile ]; then \ @@\
$(MAKE) $(MFLAGS) BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; \ @@\
else \ @@\
$(MAKE) $(MFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; \ @@\
fi
#endif /* MakeImakeDir */
/*
* DoUDB_SCRIPT3 - macro for creation of udb scripts for installation
*/
#ifndef DoUDB_SCRIPT3
#define DoUDB_SCRIPT3(target, file, script, build) @@\
target:: $(DATABASE_DIR)/file.udb @@\
script -toLst -ReleaseStream $(PLATFORM) \ @@\
$(DATABASE_DIR)/file.udb > file.lst @@\
build file ../../..
#endif
/*
* DoUDB_SCRIPT4 - macro for creation of udb scripts for installation
*/
#ifndef DoUDB_SCRIPT4
#define DoUDB_SCRIPT4(target, file, script, build) @@\
target:: $(DATABASE_DIR)/file.udb @@\
script -toLst -ReleaseStream $(PLATFORM) \ @@\
$(DATABASE_DIR)/file.udb > file.lst @@\
build file ../../../..
#endif
#ifdef DefineOldLibraryRules
#include <oldlib.rules>
#endif

2
cde/config/cf/Imake.tmpl

@ -22,6 +22,8 @@ XCOMM
#define YES 1
#define NO 0
#define HASH_SIGN #
/* Ensure that "all" is the default target in the Makefile. */
all::

2
cde/config/cf/Motif.tmpl

@ -57,7 +57,7 @@ XCOMM $TOG: Motif.tmpl /main/6 1999/05/19 17:00:05 mgreess $
#endif
#ifndef _MUseCat
# if (defined(__STDC__) && !defined(UnixCpp)) || defined(AnsiCpp)
# if (__STDC__ && !defined(UnixCpp)) || defined(AnsiCpp) || defined(__llvm__)
# if UseInstalledMotif
# define _MUseCat(a,b,c) a##c
# else

4
cde/config/cf/NetBSD.cf

@ -305,6 +305,10 @@ CXXDEPENDINCLUDE != CppCmd -x c++ -Wp,-v < /dev/null \
# define SharedDtSvcReqs $(LDPRELIBS) SharedXReqs $(CXXLIB) -Wl,-rpath,$(USRLIBDIRPATH)
#endif
#ifndef SharedDtHelpReqs
# define SharedDtHelpReqs $(LDPRELIBS) $(ICONVSYSLIB) SharedXReqs -Wl,-rpath,$(USRLIBDIRPATH)
#endif
#ifndef SharedCsaReqs
# define SharedCsaReqs -lXt $(LDPOSTLIBS) -Wl,-rpath,$(USRLIBDIRPATH)
#endif

4
cde/config/cf/bsdLib.tmpl

@ -30,6 +30,10 @@ XCOMM $XConsortium: bsdLib.tmpl /main/3 1996/09/28 16:09:25 rws $
# define SharedDtSvcReqs $(LDPRELIBS) SharedXReqs $(CXXLIB)
#endif
#ifndef SharedDtHelpReqs
# define SharedDtHelpReqs $(LDPRELIBS) $(ICONVSYSLIB) SharedXReqs
#endif
#ifndef SharedCsaReqs
# define SharedCsaReqs -lXt $(LDPOSTLIBS)
#endif

2
cde/config/cf/cde.tmpl

@ -12,7 +12,7 @@ XCOMM $XConsortium: cde.tmpl /main/2 1996/12/04 10:13:09 swick $
#endif
#ifndef _CUseCat
# if (defined(__STDC__) && !defined(UnixCpp)) || defined(AnsiCpp)
# if (__STDC__ && !defined(UnixCpp)) || defined(AnsiCpp) || defined(__llvm__)
# if UseInstalledCDE
# define _CUseCat(a,b,c) a##c
# else

25
cde/config/imake/imakemdep.h

@ -227,7 +227,7 @@ in this Software without prior written authorization from The Open Group.
* all colons). One way to tell if you need this is to see whether or not
* your Makefiles have no tabs in them and lots of @@ strings.
*/
#if defined(sun) || defined(SYSV) || defined(SVR4) || defined(hcx) || defined(WIN32) || defined(sco) || (defined(AMOEBA) && defined(CROSS_COMPILE))
#if defined(sun) || defined(SYSV) || defined(SVR4) || defined(hcx) || defined(WIN32) || defined(sco) || defined(__llvm__) || (defined(AMOEBA) && defined(CROSS_COMPILE))
#define FIXUP_CPP_WHITESPACE
#endif
#ifdef WIN32
@ -275,6 +275,9 @@ in this Software without prior written authorization from The Open Group.
|| (defined(__FreeBSD__) && defined(CPP_IN_LIBEXEC))
#define DEFAULT_CPP "/usr/libexec/cpp"
#endif
#if defined(__FreeBSD__) && (__FreeBSD__ >= 10) && !defined(__llvm__)
#undef DEFAULT_CPP
#endif
#if defined(__sgi) && defined(__ANSI_CPP__)
#define USE_CC_E
#endif
@ -354,6 +357,11 @@ char *cpp_argv[ARGUMENTS] = {
# ifdef __GNUC__
"-traditional",
# endif
# ifdef __llvm__
"-fms-extensions",
"-Wno-invalid-token-paste",
"-Wno-invalid-pp-token",
# endif
#endif
#ifdef M4330
@ -643,12 +651,18 @@ char *cpp_argv[ARGUMENTS] = {
# define DEFAULT_OS_MAJOR_REV "v V%[0-9]"
# define DEFAULT_OS_MINOR_REV "v V%*dL%[0-9]"
# define DEFAULT_OS_NAME "srvm %[^\n]"
#elif defined(__FreeBSD__) || defined(__NetBSD__)
#elif defined(__FreeBSD__)
/* uname -r returns "x.y[.z]-mumble", e.g. "9.0-RELEASE" or "11.0-CURRENT" */
# define DEFAULT_OS_MAJOR_REV "r %[0-9]"
# define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]"
# define DEFAULT_OS_TEENY_REV "v %*s %*s %*s r%[0-9]"
# define DEFAULT_OS_NAME "srm %[^\n]"
#elif defined(__NetBSD__)
/* 386BSD, and BSD/OS too? */
/* uname -r returns "x.y[.z]-mumble", e.g. "2.1.5-RELEASE" or "2.2-0801SNAP" */
# define DEFAULT_OS_MAJOR_REV "r %[0-9]"
# define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]"
# define DEFAULT_OS_TEENY_REV "r %*d.%*d.%[0-9]"
# define DEFAULT_OS_TEENY_REV "r %*d.%*d.%[0-9]"
# define DEFAULT_OS_NAME "srm %[^\n]"
#elif defined(__OpenBSD__)
# define DEFAULT_OS_MAJOR_REV "r %[0-9]"
@ -747,9 +761,12 @@ struct symtab predefs[] = {
#ifdef mc68020
{"mc68020", "1"},
#endif
#ifdef __GNUC__
#if defined(__GNUC__) && !defined(linux)
{"__GNUC__", DEF_STRINGIFY(__GNUC__)},
#endif
#ifdef __GNUC_MINOR__
{"__GNUC_MINOR__", DEF_STRINGIFY(__GNUC_MINOR__)},
#endif
#if __STDC__
{"__STDC__", "1"},
#endif

7
cde/config/makedepend/cppsetup.c

@ -216,6 +216,7 @@ my_eval_variable (ip, var, len)
const char *var;
int len;
{
long val;
struct symtab **s;
s = lookup_variable (ip, var, len);
@ -223,12 +224,14 @@ my_eval_variable (ip, var, len)
return 0;
do {
var = (*s)->s_value;
if (!isvarfirstletter(*var))
if (!isvarfirstletter(*var) || !strcmp((*s)->s_name, var))
break;
s = lookup_variable (ip, var, strlen(var));
} while (s);
return strtol(var, NULL, 0);
var = ParseIfExpression(ip, var, &val);
if (var && *var) debug(4, ("extraneous: '%s'\n", var));
return val;
}

49
cde/config/makedepend/ifparser.c

@ -81,6 +81,7 @@
#include "ifparser.h"
#include <ctype.h>
#include <limits.h>
/****************************************************************************
Internal Macros and Utilities for Parser
@ -116,19 +117,48 @@ parse_number (g, cp, valp)
const char *cp;
long *valp;
{
long base = 10;
SKIPSPACE (cp);
if (!isdigit(*cp))
return CALLFUNC(g, handle_error) (g, cp, "number");
*valp = strtol(cp, &cp, 0);
/* skip trailing qualifiers */
*valp = 0;
if (*cp == '0') {
cp++;
if ((*cp == 'x') || (*cp == 'X')) {
base = 16;
cp++;
} else {
base = 8;
}
}
/* Ignore overflows and assume ASCII, what source is usually written in */
while (1) {
int increment = -1;
if (base == 8) {
if ((*cp >= '0') && (*cp <= '7'))
increment = *cp++ - '0';
} else if (base == 16) {
if ((*cp >= '0') && (*cp <= '9'))
increment = *cp++ - '0';
else if ((*cp >= 'A') && (*cp <= 'F'))
increment = *cp++ - ('A' - 10);
else if ((*cp >= 'a') && (*cp <= 'f'))
increment = *cp++ - ('a' - 10);
} else { /* Decimal */
if ((*cp >= '0') && (*cp <= '9'))
increment = *cp++ - '0';
}
if (increment < 0)
break;
*valp = (*valp * base) + increment;
}
/* Skip trailing qualifiers */
while (*cp == 'U' || *cp == 'u' || *cp == 'L' || *cp == 'l') cp++;
#if 0
*valp = atoi (cp);
/* EMPTY */
for (cp++; isdigit(*cp); cp++) ;
#endif
return cp;
}
@ -272,7 +302,10 @@ parse_product (g, cp, valp)
case '/':
DO (cp = parse_product (g, cp + 1, &rightval));
*valp = (*valp / rightval);
if (rightval)
*valp = (*valp / rightval);
else
*valp = LONG_MAX;
break;
case '%':

11
cde/config/makedepend/main.c

@ -255,6 +255,17 @@ main(argc, argv)
argc--;
}
break;
case 'i':
if (strncmp(argv[0]+2, "system", 6) == 0) {
if (incp >= includedirs + MAXDIRS)
fatalerr("Too many -I flags.\n");
*incp++ = argv[0]+8;
if (**(incp-1) == '\0') {
*(incp-1) = *(++argv);
argc--;
}
}
break;
case 'Y':
defincdir = argv[0]+2;
break;

9
cde/config/makedepend/parse.c

@ -110,7 +110,7 @@ int deftype (line, filep, file_red, file, parse_it)
int parse_it;
{
register char *p;
char *directive, savechar;
char *directive, savechar, *q;
register int ret;
/*
@ -167,6 +167,11 @@ int deftype (line, filep, file_red, file, parse_it)
*/
while (*p == ' ' || *p == '\t')
p++;
q = p + strlen(p);
do {
q--;
} while (*q == ' ' || *q == '\t');
q[1] = '\0';
switch (ret) {
case IF:
/*
@ -227,7 +232,7 @@ int deftype (line, filep, file_red, file, parse_it)
/*
* copy the definition back to the beginning of the line.
*/
strcpy (line, p);
memmove (line, p, strlen(p) + 1);
break;
case ELSE:
case ENDIF:

45
cde/databases/Imakefile

@ -41,8 +41,9 @@ UDB_RELEASE_OPT = -ReleaseStream netbsd
* Insure that symbols used in the .udb files are undefined for
* pre-processing by cpp.
*/
#ifdef RsArchitecture
/* AIX cpp rejects "hp-ux" as an invalid sub-option. */
#if defined(LinuxArchitecture) || defined(BSDArchitecture) || \
defined(RsArchitecture)
/* cpp of some systems reject "hp-ux" as an invalid sub-option. */
UDB_CPP_UNDEF_LIST = -UhpV4 -Uhpux -Uaix -Usun -Uusl -Udec -Uuxp -Uunix
#else
UDB_CPP_UNDEF_LIST = -UhpV4 -Uhpux -Uhp-ux -Uaix -Usun -Uusl -Udec -Uuxp -Uunix -Ulinux -Uopenbsd -Ufreebsd -Unetbsd
@ -56,10 +57,12 @@ clean:: @@\
Concat3(CDE-,Locale,.udb):: ResDB @@\
@echo Building readablename Resources database file. @@\
@rm -f $@ @@\
@echo sed -e 's/%_LANG_%/Lang/g' -e 's/%_ALT_LANG_%/AltLang/g' \@@\
-e 's/%_FILENAME_%/runfs/g' ResDB @@\
@sed -e 's/%_LANG_%/Lang/g' -e 's/%_ALT_LANG_%/AltLang/g' \ @@\
-e 's/%_FILENAME_%/runfs/g' ResDB > $@ @@\
@echo $(SED) -e STR(s/%_LANG_%/Lang/g) \ @@\
-e STR(s/%_ALT_LANG_%/AltLang/g) \ @@\
-e STR(s/%_FILENAME_%/runfs/g) ResDB @@\
@$(SED) -e STR(s/%_LANG_%/Lang/g) \ @@\
-e STR(s/%_ALT_LANG_%/AltLang/g) \ @@\
-e STR(s/%_FILENAME_%/runfs/g) ResDB > $@ @@\
@@\
clean:: @@\
$(RM) Concat3(CDE-HELP-,Locale,.udb) @@\
@ -67,10 +70,12 @@ clean:: @@\
CDE-HELP-Locale.udb:: HelpDB @@\
@echo Building readablename Help database file. @@\
@rm -f $@ @@\
@echo sed -e 's/%_LANG_%/HelpLang/' -e 's/%_ALT_LANG_%/AltLang/g' \ @@\
-e 's/%_FILENAME_%/helpfs/g' HelpDB @@\
@sed -e 's/%_LANG_%/HelpLang/' -e 's/%_ALT_LANG_%/AltLang/g' \ @@\
-e 's/%_FILENAME_%/helpfs/g' HelpDB > $@ @@\
@echo $(SED) -e STR(s/%_LANG_%/HelpLang/) \ @@\
-e STR(s/%_ALT_LANG_%/AltLang/g) \ @@\
-e STR(s/%_FILENAME_%/helpfs/g) HelpDB @@\
@$(SED) -e STR(s/%_LANG_%/HelpLang/) \ @@\
-e STR(s/%_ALT_LANG_%/AltLang/g) \ @@\
-e STR(s/%_FILENAME_%/helpfs/g) HelpDB > $@ @@\
@@\
clean:: @@\
$(RM) Concat3(CDE-MSG-,Locale,.udb) @@\
@ -78,10 +83,12 @@ clean:: @@\
CDE-MSG-Locale.udb:: MsgDB @@\
@echo Building readablename Message catalog database file. @@\
@rm -f $@ @@\
@echo sed -e 's/%_LANG_%/Lang/' -e 's/%_ALT_LANG_%/AltLang/g' \ @@\
-e 's/%_FILENAME_%/msgfs/g' MsgDB @@\
@sed -e 's/%_LANG_%/Lang/' -e 's/%_ALT_LANG_%/AltLang/g' \ @@\
-e 's/%_FILENAME_%/msgfs/g' MsgDB > $@ @@\
@echo $(SED) -e STR(s/%_LANG_%/Lang/) \ @@\
-e STR(s/%_ALT_LANG_%/AltLang/g) \ @@\
-e STR(s/%_FILENAME_%/msgfs/g) MsgDB @@\
@$(SED) -e STR(s/%_LANG_%/Lang/) \ @@\
-e STR(s/%_ALT_LANG_%/AltLang/g) \ @@\
-e STR(s/%_FILENAME_%/msgfs/g) MsgDB > $@ @@\
@@\
clean:: @@\
$(RM) Concat3(CDE-INFOLIB-,Locale,.udb) @@\
@ -89,10 +96,12 @@ clean:: @@\
CDE-INFOLIB-Locale.udb:: InfoDB @@\
@echo Building readablename Infolib catalog database file. @@\
@rm -f $@ @@\
@echo sed -e 's/%_LANG_%/Lang/' -e 's/%_ALT_LANG_%/AltLang/g' \ @@\
-e 's/%_FILENAME_%/msgfs/g' InfoDB @@\
@sed -e 's/%_LANG_%/Lang/' -e 's/%_ALT_LANG_%/AltLang/g' \ @@\
-e 's/%_FILENAME_%/msgfs/g' InfoDB > $@
@echo $(SED) -e STR(s/%_LANG_%/Lang/) \ @@\
-e STR(s/%_ALT_LANG_%/AltLang/g) \ @@\
-e STR(s/%_FILENAME_%/msgfs/g) InfoDB @@\
@$(SED) -e STR(s/%_LANG_%/Lang/) \ @@\
-e STR(s/%_ALT_LANG_%/AltLang/g) \ @@\
-e STR(s/%_FILENAME_%/msgfs/g) InfoDB > $@
.SUFFIXES: .db .udb

4
cde/include/EUSCompat.h

@ -114,11 +114,13 @@ typedef enum {B_FALSE, B_TRUE} boolean_t;
typedef enum {B_FALSE, B_TRUE} boolean_t;
#define MAXNAMELEN 256
#if !defined(__FreeBSD__)
#define iconv_t int
#define iconv_open(a, b) ((iconv_t) -1)
#define iconv(a, b, c, d, e) ((size_t) 0)
#define iconv_close(a) (0)
#endif /* linux */
#endif
#endif
/*

4
cde/lib/DtHelp/il/ilX.c

@ -914,12 +914,12 @@ int scaledX, scaledY ;
nSrcLines = *pNLines;
if (nSrcLines <= 0)
return; /* no lines, EXIT */
return 0; /* no lines, EXIT */
pPriv = (ilXPrivPtr)pData->pPrivate;
pSrcImage = pData->pSrcImage;
width = pSrcImage->width;
if (width <= 0)
return; /* no width, EXIT */
return 0; /* no width, EXIT */
srcRowBytes = pSrcImage->plane[0].nBytesPerRow;
pSrcLine = (ilPtr)(pSrcImage->plane[0].pPixels +
pData->srcLine * srcRowBytes);

2
cde/lib/DtHelp/il/ilbigray.c

@ -242,7 +242,7 @@ register int shift, bitNumber;
nLines = *pNLines;
if (nLines <= 0)
return; /* no lines, EXIT */
return 0; /* no lines, EXIT */
if (pPriv->srcBufferHeight)
bottomLine = pPriv->srcBufferHeight - 1;
else bottomLine = pData->srcLine + nLines - 1;

4
cde/lib/DtHelp/il/ilimage.c

@ -619,11 +619,11 @@ register ilImagePtr pImage;
pImage = (ilImagePtr)image;
if (mustBeZero != 0) {
pImage->o.p.context->error = IL_ERROR_PAR_NOT_ZERO;
return; /* EXIT */
return 0; /* EXIT */
}
if (pImage->o.p.objectType != IL_INTERNAL_IMAGE) {
pImage->o.p.context->error = IL_ERROR_OBJECT_TYPE;
return; /* EXIT */
return 0; /* EXIT */
}
pImage->o.p.context->error = IL_OK;

4
cde/lib/DtHelp/il/ilinvert.c

@ -106,10 +106,10 @@ register long nLines, nPixels;
dstnbytes = pPriv->dstRowBytes;
pdstline = pPriv->pDstPixels + dstLine * dstnbytes;
if (pPriv->nPixels < 0) return;
if (pPriv->nPixels < 0) return 0;
nLines = *pNLines;
if (nLines <= 0) return;
if (nLines <= 0) return 0;
while ( nLines-- > 0 ) {
psrc = psrcline;

8
cde/lib/DtHelp/il/ilmap.c

@ -86,11 +86,11 @@ register ilPtr pSrc, pDst, pTranslate;
pPriv = (ilMapPrivPtr)pData->pPrivate;
nRowsM1 = pPriv->width;
if (nRowsM1 <= 0)
return;
return 0;
nRowsM1--;
nLinesM1 = *pNLines;
if (nLinesM1 <= 0)
return;
return 0;
nLinesM1--;
srcRowBytes = pPriv->srcRowBytes;
@ -135,11 +135,11 @@ register ilPtr pSrc, pDst, pTranslate;
pPriv = (ilMapPrivPtr)pData->pPrivate;
nRowsM1 = pPriv->width;
if (nRowsM1 <= 0)
return;
return 0;
nRowsM1--;
nLinesM1 = *pNLines;
if (nLinesM1 <= 0)
return;
return 0;
nLinesM1--;
srcRowBytes = pPriv->srcRowBytes;

4
cde/lib/DtHelp/il/ilpalette.c

@ -159,10 +159,10 @@ register long nLinesM1, nPixelsM1Temp;
nPixelsM1 = pPriv->nPixelsM1;
if (nPixelsM1 < 0)
return;
return 0;
nLinesM1 = *pNLines;
if (nLinesM1 <= 0)
return;
return 0;
nLinesM1--;
/* For each src byte: get a long from the cvt'd palette table, then take

4
cde/lib/DtHelp/il/iltruegray.c

@ -141,10 +141,10 @@ register INT32 i;
dstnbytes = pPriv->dstRowBytes;
pdstline = pPriv->pDstPixels + dstLine * dstnbytes;
if (pPriv->nPixels < 0) return;
if (pPriv->nPixels < 0) return 0;
nLines = *pNLines;
if (nLines <= 0) return;
if (nLines <= 0) return 0;
while ( nLines-- > 0 ) {

12
cde/lib/DtHelp/il/ilycbcr.c

@ -327,11 +327,11 @@ ilImagePlaneInfo *pPlane;
/* Set nPixels/LinesM1 to # pixels / lines - 1; exit if either 0. */
nPixelsM1Init = pData->pSrcImage->width;
if (nPixelsM1Init <= 0)
return;
return 0;
nPixelsM1Init--;
nLinesM1 = *pNLines;
if (nLinesM1 <= 0)
return;
return 0;
nLinesM1--;
/* Point pY/Cb/CrLine to 1st line in src planes; pDstLine to 1st line in dst.
@ -420,11 +420,11 @@ ilImagePlaneInfo *pPlane;
/* Set nPixels/LinesM1 to # pixels / lines - 1; exit if either 0. */
nPixelsM1Init = pData->pSrcImage->width;
if (nPixelsM1Init <= 0)
return;
return 0;
nPixelsM1Init--;
nLinesM1 = *pNLines;
if (nLinesM1 <= 0)
return;
return 0;
nLinesM1--;
/* Point pY/Cb/CrLine to 1st line in src planes; pDstLine to 1st line in dst.
@ -1161,11 +1161,11 @@ register long R, G, B, pixel;
pPriv = (ilRGBToYCbCrPrivPtr)pData->pPrivate;
nPixelsM1Init = pData->pSrcImage->width;
if (nPixelsM1Init <= 0)
return;
return 0;
nPixelsM1Init--;
nLinesM1 = *pNLines;
if (nLinesM1 <= 0)
return;
return 0;
nLinesM1--;
/* Point pSrcLine to first line of src RGB (pixel-order) data; point

4
cde/lib/DtPrint/PrintOptions.c

@ -460,7 +460,7 @@ _DtPrintGetHdrFtrData(
if (! option) return (void*) NULL;
XtVaGetValues(option, XmNuserData, &info, NULL);
if (info == NULL) return;
if (info == NULL) return 0;
index = _DtPrintGetHdrFtrIndex(option);
return info->specs[index].data;
@ -484,7 +484,7 @@ _DtPrintGetHdrFtrString(
if (! option) return (void*) NULL;
XtVaGetValues(option, XmNuserData, &info, NULL);
if (info == NULL) return;
if (info == NULL) return 0;
index = _DtPrintGetHdrFtrIndex(option);
return info->specs[index].string;

2
cde/lib/DtTerm/TermPrim/TermPrimBuffer.c

@ -1025,7 +1025,7 @@ _DtTermPrimBufferInsert
_DtTermPrimBufferInsertWc(tb, row, col, (wchar_t *)newChars,
numChars, insertFlag,
returnChars, returnCount);
return;
return 0;
}
if (WIDTH(line) < col)

2
cde/lib/DtTerm/TermPrim/TermPrimParser.c

@ -121,7 +121,7 @@ _DtTermPrimParse
if (*parseChar == debugChar) {
ParseTrap();
return;
return 0;
}
}
}

8
cde/lib/csa/Imakefile

@ -105,12 +105,14 @@ rtable3_clnt.c rtable3_xdr.c: rtable3.h namechange1.sed namechange2.sed
rtable2_clnt.c rtable2_xdr.c: rtable3.h namechange1.sed namechange2.sed
agent_xdr.c agent.c: agent.h
#define RPCGEN rpcgen -h agent.x | $(EXTRASED) \ @@\
$(SED) -f namechange1.sed | \ @@\
$(SED) -f namechange2.sed >> agent.h
agent.h:
$(RM) $@
cat agent.wrapbegin > agent.h
rpcgen -h agent.x | $(EXTRASED) \
sed -f namechange1.sed | \
sed -f namechange2.sed >> agent.h
RPCGEN
cat agent.wrapend >> agent.h
.SUFFIXES: .x

8
cde/lib/tt/mini_isam/isdatconv.c

@ -140,7 +140,7 @@ ldchar(src, len, dst)
register char *p;
if (len <= 0)
return;
return 0;
/* Load the entire string. */
memcpy((void *) dst, (const void *) src, len);
@ -165,7 +165,7 @@ stchar(src, dst, len)
register char c;
if (len <= 0)
return;
return 0;
/* Copy up to NULL character. */
do {
@ -190,7 +190,7 @@ ldchar2(src, len, dst)
register char *p;
if (len <= 0)
return;
return 0;
/* Load the entire string. */
memcpy((void *) dst, (const void *) src, len);
@ -206,7 +206,7 @@ stchar2(src, dst, len)
register char c;
if (len <= 0)
return;
return 0;
/* Copy up to a NULL character. */
do {

2
cde/lib/tt/mini_isam/isrepair.c

@ -411,7 +411,7 @@ printkey(n, pkdesc, print)
if (pkdesc->k_nparts == 0) {
print("%3d: --- NO PRIMARY KEY ---\n", n);
return;
return 0;
}
if (n == 1)

2
cde/programs/dsdm/proxy.c

@ -517,7 +517,7 @@ AdvertiseMotifDropSite(dpy, win)
XFree(data);
}
if (motif_receiver)
return;
return 0;
#ifdef DEBUG
printf("AdvertiseMotifDropSite\n");

4
cde/programs/dtcm/dtcm/todo.c

@ -2483,7 +2483,7 @@ todo_insert(Dtcm_appointment *appt, CSA_entry_handle *new_a, Calendar *c) {
* occurred.
*/
_DtTurnOffHourGlass(t->frame);
return;
return 0;
case 4:
default:
/*
@ -2501,7 +2501,7 @@ todo_insert(Dtcm_appointment *appt, CSA_entry_handle *new_a, Calendar *c) {
if (stat != CSA_SUCCESS) {
_DtTurnOffHourGlass(t->frame);
return;
return 0;
}
csa_free((CSA_buffer) new_a);

2
cde/programs/dtcm/dtcm/x_graphics.c

@ -1677,7 +1677,7 @@ cm_count_appts(CMGraphicsInfo *gInfo, CSA_entry_handle *list, int a_total,
if (stat != CSA_SUCCESS)
{
free_appt_struct(&appt);
return;
return 0;
}
skip_appt = B_FALSE;

2
cde/programs/dticon/image.c

@ -486,7 +486,7 @@ Flood_Fill(
struct seg stack[MAX], *sp = stack;
old_pixel = XGetPixel(color_image, x, y); /* read pv at seed point */
if (old_pixel==new_pixel || x<0 || x>width || y<0 || y>height) return;
if (old_pixel==new_pixel || x<0 || x>width || y<0 || y>height) return 0;
PUSH(y, x, x, 1); /* needed in some cases */
PUSH(y+1, x, x, -1); /* seed segment (popped 1st) */

2
cde/programs/dticon/utils.c

@ -1755,7 +1755,7 @@ Select_New_Pen(
XmToggleButtonSetState(StaticWid[new_pen], True, False);
else
XmToggleButtonSetState(DynamicWid[new_pen], True, False);
return;
return 0;
}
/*** un-set the previous choice ***/

3
cde/programs/dtinfo/DtMmdb/StyleSheet/Expression.C

@ -293,6 +293,9 @@ ConstantNode::evaluate() const
extern unsigned g_validation_mode;
#if defined(__FreeBSD__) && (__FreeBSD__ >= 10) && !defined(__llvm__)
__attribute__((optimize(0)))
#endif
FeatureValue *
SgmlAttributeNode::evaluate() const
{

4
cde/programs/dtinfo/DtMmdb/StyleSheet/defToken.C

@ -495,11 +495,13 @@ void defParser_init_buffer defParser_PROTO(( defParser_BUFFER_STATE b, FILE *fil
#define defParser_new_buffer defParser_create_buffer
#if 0
#ifdef __cplusplus
static int defParserinput defParser_PROTO(( void ));
#else
static int input defParser_PROTO(( void ));
#endif
#endif
defParser_DECL
{
@ -1104,6 +1106,7 @@ register defParser_CHAR *defParser_bp;
#endif
#if 0
#ifdef __cplusplus
static int defParserinput()
#else
@ -1170,6 +1173,7 @@ static int input()
return ( c );
}
#endif
#ifdef defParser_USE_PROTOS

4
cde/programs/dtinfo/DtMmdb/compression/ps.C

@ -427,11 +427,13 @@ void ps_init_buffer ps_PROTO(( ps_BUFFER_STATE b, FILE *file ));
#define ps_new_buffer ps_create_buffer
#if 0
#ifdef __cplusplus
static int psinput ps_PROTO(( void ));
#else
static int input ps_PROTO(( void ));
#endif
#endif
ps_DECL
{
@ -856,6 +858,7 @@ register ps_CHAR *ps_bp;
#endif
#if 0
#ifdef __cplusplus
static int psinput()
#else
@ -922,6 +925,7 @@ static int input()
return ( c );
}
#endif
#ifdef ps_USE_PROTOS

4
cde/programs/dtinfo/DtMmdb/compression/sgml.C

@ -433,11 +433,13 @@ void sgml_init_buffer sgml_PROTO(( sgml_BUFFER_STATE b, FILE *file ));
#define sgml_new_buffer sgml_create_buffer
#if 0
#ifdef __cplusplus
static int sgmlinput sgml_PROTO(( void ));
#else
static int input sgml_PROTO(( void ));
#endif
#endif