From 917f7da1912033cce55c20fec8be6a7d3ece384d Mon Sep 17 00:00:00 2001 From: Marcin Cieslak Date: Mon, 24 Sep 2012 17:52:58 +0200 Subject: [PATCH] 157 warnings: remove -DXK_MISCELLANY from Makefiles Fixes the following warning: In file included from ../../../imports/x11/include/X11/Xutil.h:54, from ../../../imports/x11/include/X11/Intrinsic.h:54, from Action.c:64: ../../../imports/x11/include/X11/keysym.h:49:1: warning: "XK_MISCELLANY" redefined : warning: this is the location of the previous definition which includes all key symbols and loads is automaticlly included by the X Toolkit. This patch removes #include whenever not needed, and adds #define XK_MISCALLANY in the source code where required. --- cde/config/cf/fujitsu.cf | 2 +- cde/config/cf/hp.cf | 2 +- cde/config/cf/osf1.cf | 2 +- cde/config/cf/sco.cf | 2 +- cde/config/cf/sun.cf | 2 +- cde/config/cf/usl.cf | 2 +- cde/examples/dtprint/Imakefile | 2 +- cde/lib/DtHelp/HelpUtil.c | 1 - cde/lib/DtHelp/Imakefile | 2 +- cde/lib/DtHelp/il/Imakefile | 2 +- cde/lib/DtHelp/jpeg/Imakefile | 2 +- cde/lib/DtPrint/Imakefile | 2 +- cde/lib/DtSearch/Imakefile | 2 +- cde/lib/DtSearch/raima/Imakefile | 2 +- cde/lib/DtSvc/DtCodelibs/Imakefile | 2 +- cde/lib/DtSvc/DtEncap/Imakefile | 2 +- cde/lib/DtSvc/DtUtil1/Imakefile | 2 +- cde/lib/DtSvc/DtUtil2/Imakefile | 2 +- cde/lib/DtSvc/Imakefile | 2 +- cde/programs/dtaction/Imakefile | 1 - cde/programs/dtdbcache/Imakefile | 2 -- cde/programs/dtfile/File.c | 3 +++ cde/programs/dtfile/FileMgr.c | 1 - cde/programs/dtfile/FileOp.c | 1 - cde/programs/dtfile/IconWindow.c | 3 +++ cde/programs/dtfile/Imakefile | 2 +- cde/programs/dtfile/Main.c | 2 -- cde/programs/dtfile/ToolTalk.c | 1 - cde/programs/dtfile/dtcopy/Imakefile | 2 +- cde/programs/dtinfo/tools/config/fujitsu.cf | 2 +- cde/programs/dtinfo/tools/config/hp.cf | 2 +- cde/programs/dtinfo/tools/config/osf1.cf | 2 +- cde/programs/dtinfo/tools/config/sco.cf | 2 +- cde/programs/dtinfo/tools/config/sun.cf | 2 +- cde/programs/dtinfo/tools/config/usl.cf | 2 +- cde/programs/dtpdm/Imakefile | 2 +- cde/programs/util/dttypes/Imakefile | 1 - 37 files changed, 33 insertions(+), 37 deletions(-) diff --git a/cde/config/cf/fujitsu.cf b/cde/config/cf/fujitsu.cf index d2c8c3410..95db523f0 100644 --- a/cde/config/cf/fujitsu.cf +++ b/cde/config/cf/fujitsu.cf @@ -84,7 +84,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion) #define GencatFlags -m -#define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE -DNO_REGCOMP -DHAVE_PTMS +#define DtSvcDefines -DMULTIBYTE -DNO_REGCOMP -DHAVE_PTMS #define DtSearchDefines -DI18N_MSG DtSvcDefines -DNEED_STRCASECMP #define DtWidgetDefines DtSearchDefines diff --git a/cde/config/cf/hp.cf b/cde/config/cf/hp.cf index c39176998..d93828c22 100644 --- a/cde/config/cf/hp.cf +++ b/cde/config/cf/hp.cf @@ -192,7 +192,7 @@ XCOMM operating system: OSName (OSMajorVersion.OSMinorVersion.OSTeenyVersion) #define CdeCplusplusProjectDefines \ CdeBaseProjectDefines CplusplusAnsiDefines -#define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE -DMESSAGE_CAT +#define DtSvcDefines -DMULTIBYTE -DMESSAGE_CAT #define DtSearchDefines -DI18N_MSG DtSvcDefines #define DtWidgetDefines DtSearchDefines #define DtPrintDefines DtSearchDefines diff --git a/cde/config/cf/osf1.cf b/cde/config/cf/osf1.cf index 41ff46c13..c55248668 100644 --- a/cde/config/cf/osf1.cf +++ b/cde/config/cf/osf1.cf @@ -160,7 +160,7 @@ XCOMM operating system: OSName (OSMajorVersion.OSMinorVersion) #define LSBBitOrder YES #define MotifDefines -DNO_REGCOMP -DNO_REGEX -DSTRINGS_ALIGNED -#define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE -DMESSAGE_CAT +#define DtSvcDefines -DMULTIBYTE -DMESSAGE_CAT #define DtSearchDefines -DI18N_MSG DtSvcDefines #define DtWidgetDefines DtSearchDefines #define DtPrintDefines DtSearchDefines diff --git a/cde/config/cf/sco.cf b/cde/config/cf/sco.cf index b8e37e507..d97ce3c72 100644 --- a/cde/config/cf/sco.cf +++ b/cde/config/cf/sco.cf @@ -66,7 +66,7 @@ XCOMM #define ForceNormalLib YES #include /* minor changes to sv4Lib.rules */ #include -#define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE +#define DtSvcDefines -DMULTIBYTE #define DtSearchDefines -DI18N_MSG DtSvcDefines #define DtWidgetDefines DtSearchDefines #define DtPrintDefines DtSearchDefines diff --git a/cde/config/cf/sun.cf b/cde/config/cf/sun.cf index 6826d9d1a..d07aa84f4 100644 --- a/cde/config/cf/sun.cf +++ b/cde/config/cf/sun.cf @@ -341,7 +341,7 @@ man_keywords:: @@\ -DNO_ISDIR -DNO_REGCOMP -DNO_ALLOCA -DBOGUS_MB_MAX -DNO_CONST #define PamUnixDefines -DPAM_NIS #define TtLargePICTable YES -#define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE -DNO_REGCOMP +#define DtSvcDefines -DMULTIBYTE -DNO_REGCOMP #define DtSearchDefines -DI18N_MSG DtSvcDefines #define DtWidgetDefines DtSearchDefines #define DtPrintDefines DtSearchDefines diff --git a/cde/config/cf/usl.cf b/cde/config/cf/usl.cf index 24b70822d..87c7e9d84 100644 --- a/cde/config/cf/usl.cf +++ b/cde/config/cf/usl.cf @@ -83,7 +83,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVer #define XmDefines \ -DNO_REGCOMP -DNEED_STRCASECMP \ -DSUPPORT_ZERO_WIDTH -DHAS_WIDECHAR_FUNCTIONS -#define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE -DNO_REGCOMP +#define DtSvcDefines -DMULTIBYTE -DNO_REGCOMP #define DtSearchDefines -DI18N_MSG DtSvcDefines #define DtWidgetDefines DtSearchDefines #define DtPrintDefines DtSearchDefines diff --git a/cde/examples/dtprint/Imakefile b/cde/examples/dtprint/Imakefile index 116d3832d..48102a849 100644 --- a/cde/examples/dtprint/Imakefile +++ b/cde/examples/dtprint/Imakefile @@ -6,7 +6,7 @@ DESKTOP_VERSION_STRING = DesktopVersionString * USE_libraryname in LOCAL_LIBRARIES is by default empty. * It should be set when necessary to the real library macro name. */ - DEFINES = -DXK_MISCELLANY -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" + DEFINES = -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" INCLUDES = -I. /* DEPLIBS contains the list of library depencies for a client. diff --git a/cde/lib/DtHelp/HelpUtil.c b/cde/lib/DtHelp/HelpUtil.c index fe709ee40..38967729e 100644 --- a/cde/lib/DtHelp/HelpUtil.c +++ b/cde/lib/DtHelp/HelpUtil.c @@ -59,7 +59,6 @@ #include #include -#include #include #include #include diff --git a/cde/lib/DtHelp/Imakefile b/cde/lib/DtHelp/Imakefile index 3c2bcfe0a..a33c70468 100644 --- a/cde/lib/DtHelp/Imakefile +++ b/cde/lib/DtHelp/Imakefile @@ -37,7 +37,7 @@ INCLUDES = -I. -I./il -I./jpeg #if defined(OpenBSDArchitecture) INCLUDES += -I$(INCROOT) #endif -DEFINES = -DDTLIB -DXK_MISCELLANY $(LOCAL_DEFINES) \ +DEFINES = -DDTLIB $(LOCAL_DEFINES) \ -DCDE_INSTALLATION_TOP='"$(CDE_INSTALLATION_TOP)"' \ -DCDE_CONFIGURATION_TOP='"$(CDE_CONFIGURATION_TOP)"' \ -DCDE_USER_TOP='"$(CDE_USER_TOP)"' \ diff --git a/cde/lib/DtHelp/il/Imakefile b/cde/lib/DtHelp/il/Imakefile index 8265271c3..6070e607b 100644 --- a/cde/lib/DtHelp/il/Imakefile +++ b/cde/lib/DtHelp/il/Imakefile @@ -16,7 +16,7 @@ BIT_ORDER_DEFINES = -DLSB_BIT_ORDER #endif INCLUDES = -I. -I.. -DEFINES = -DDTLIB -DXK_MISCELLANY $(LOCAL_DEFINES) \ +DEFINES = -DDTLIB $(LOCAL_DEFINES) \ -DCDE_INSTALLATION_TOP='"$(CDE_INSTALLATION_TOP)"' \ -DCDE_CONFIGURATION_TOP='"$(CDE_CONFIGURATION_TOP)"' \ -DCDE_USER_TOP='"$(CDE_USER_TOP)"' \ diff --git a/cde/lib/DtHelp/jpeg/Imakefile b/cde/lib/DtHelp/jpeg/Imakefile index e85e86068..35edaa74b 100644 --- a/cde/lib/DtHelp/jpeg/Imakefile +++ b/cde/lib/DtHelp/jpeg/Imakefile @@ -16,7 +16,7 @@ BIT_ORDER_DEFINES = -DLSB_BIT_ORDER #endif INCLUDES = -I. -I.. -DEFINES = -DDTLIB -DXK_MISCELLANY $(LOCAL_DEFINES) \ +DEFINES = -DDTLIB $(LOCAL_DEFINES) \ -DCDE_INSTALLATION_TOP='"$(CDE_INSTALLATION_TOP)"' \ -DCDE_CONFIGURATION_TOP='"$(CDE_CONFIGURATION_TOP)"' \ -DCDE_USER_TOP='"$(CDE_USER_TOP)"' \ diff --git a/cde/lib/DtPrint/Imakefile b/cde/lib/DtPrint/Imakefile index f84aea848..97e332eb9 100644 --- a/cde/lib/DtPrint/Imakefile +++ b/cde/lib/DtPrint/Imakefile @@ -8,7 +8,7 @@ XCOMM $XConsortium: Imakefile /main/11 1996/10/31 02:09:04 cde-hp $ #define IncSubdir Dt #ifndef DtPrintDefines -# define DtPrintDefines -DXK_MISCELLANY -DMULTIBYTE -DI18N_MSG +# define DtPrintDefines -DMULTIBYTE -DI18N_MSG #endif DEFINES = DtPrintDefines INCLUDES = -I. diff --git a/cde/lib/DtSearch/Imakefile b/cde/lib/DtSearch/Imakefile index 49aa17cc5..5dc3f3559 100644 --- a/cde/lib/DtSearch/Imakefile +++ b/cde/lib/DtSearch/Imakefile @@ -26,7 +26,7 @@ DependSubdirs($(SUBDIRS)) #define IncSubdir Dt #ifndef DtSearchDefines -# define DtSearchDefines -DI18N_MSG -DXK_MISCELLANY -DMULTIBYTE +# define DtSearchDefines -DI18N_MSG -DMULTIBYTE #endif DEFINES = DtSearchDefines INCLUDES = -I. -I./raima diff --git a/cde/lib/DtSearch/raima/Imakefile b/cde/lib/DtSearch/raima/Imakefile index a7d729bd2..857a89697 100644 --- a/cde/lib/DtSearch/raima/Imakefile +++ b/cde/lib/DtSearch/raima/Imakefile @@ -33,7 +33,7 @@ EXTRA_DEFINES = -D_XOPEN_SOURCE #define LibCreate NO #ifndef DtSvcDefines -# define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE +# define DtSvcDefines -DMULTIBYTE #endif DEFINES = DtSvcDefines \ -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \ diff --git a/cde/lib/DtSvc/DtCodelibs/Imakefile b/cde/lib/DtSvc/DtCodelibs/Imakefile index fb6ae3d58..5ce7fba15 100644 --- a/cde/lib/DtSvc/DtCodelibs/Imakefile +++ b/cde/lib/DtSvc/DtCodelibs/Imakefile @@ -22,7 +22,7 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES) #include #ifndef DtSvcDefines -# define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE +# define DtSvcDefines -DMULTIBYTE #endif DEFINES = DtSvcDefines INCLUDES = -I. -I../include diff --git a/cde/lib/DtSvc/DtEncap/Imakefile b/cde/lib/DtSvc/DtEncap/Imakefile index 87796b77b..84429e250 100644 --- a/cde/lib/DtSvc/DtEncap/Imakefile +++ b/cde/lib/DtSvc/DtEncap/Imakefile @@ -19,7 +19,7 @@ XCOMM (c) Copyright 1996 Hitachi. #include #ifndef DtSvcDefines -# define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE +# define DtSvcDefines -DMULTIBYTE #endif DEFINES = DtSvcDefines \ -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \ diff --git a/cde/lib/DtSvc/DtUtil1/Imakefile b/cde/lib/DtSvc/DtUtil1/Imakefile index cdc461637..c72ed3dab 100644 --- a/cde/lib/DtSvc/DtUtil1/Imakefile +++ b/cde/lib/DtSvc/DtUtil1/Imakefile @@ -12,7 +12,7 @@ XCOMM $XConsortium: Imakefile /main/6 1996/08/20 14:48:27 drk $ #include #ifndef DtSvcDefines -# define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE +# define DtSvcDefines -DMULTIBYTE #endif DEFINES = DtSvcDefines \ -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \ diff --git a/cde/lib/DtSvc/DtUtil2/Imakefile b/cde/lib/DtSvc/DtUtil2/Imakefile index 239d5ebba..0fa0238c6 100644 --- a/cde/lib/DtSvc/DtUtil2/Imakefile +++ b/cde/lib/DtSvc/DtUtil2/Imakefile @@ -11,7 +11,7 @@ XCOMM $TOG: Imakefile /main/14 1998/04/22 14:18:31 mgreess $ #include #ifndef DtSvcDefines -# define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE +# define DtSvcDefines -DMULTIBYTE #endif DEFINES = DtSvcDefines \ -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \ diff --git a/cde/lib/DtSvc/Imakefile b/cde/lib/DtSvc/Imakefile index ca1613beb..e3e9908bf 100644 --- a/cde/lib/DtSvc/Imakefile +++ b/cde/lib/DtSvc/Imakefile @@ -22,7 +22,7 @@ DependSubdirs($(SUBDIRS)) #include #ifndef DtSvcDefines -# define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE +# define DtSvcDefines -DMULTIBYTE #endif DEFINES = DtSvcDefines diff --git a/cde/programs/dtaction/Imakefile b/cde/programs/dtaction/Imakefile index a0b9ebd93..987d38fa0 100644 --- a/cde/programs/dtaction/Imakefile +++ b/cde/programs/dtaction/Imakefile @@ -1,6 +1,5 @@ XCOMM $TOG: Imakefile /main/9 1998/04/06 13:11:38 mgreess $ - DEFINES = -DXK_MISCELLANY INCLUDES = -I. DEPLIBS = $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB) diff --git a/cde/programs/dtdbcache/Imakefile b/cde/programs/dtdbcache/Imakefile index a4f72e906..a8d82d7d8 100644 --- a/cde/programs/dtdbcache/Imakefile +++ b/cde/programs/dtdbcache/Imakefile @@ -9,8 +9,6 @@ XCOMM $XConsortium: Imakefile /main/5 1996/09/14 15:26:52 drk $ * It should be set when necessary to the real library macro name. */ - DEFINES = -DXK_MISCELLANY - INCLUDES = -I. /* DEPLIBS contains the list of library depencies for a client. diff --git a/cde/programs/dtfile/File.c b/cde/programs/dtfile/File.c index 6c80338d2..8cefb266f 100644 --- a/cde/programs/dtfile/File.c +++ b/cde/programs/dtfile/File.c @@ -159,6 +159,9 @@ #include #include #include +#ifndef XK_MISCELLANY +#define XK_MISCELLANY +#endif #include #ifdef SHAPE diff --git a/cde/programs/dtfile/FileMgr.c b/cde/programs/dtfile/FileMgr.c index 165284bca..303d8ce08 100644 --- a/cde/programs/dtfile/FileMgr.c +++ b/cde/programs/dtfile/FileMgr.c @@ -132,7 +132,6 @@ #include #include #include -#include #include diff --git a/cde/programs/dtfile/FileOp.c b/cde/programs/dtfile/FileOp.c index e835ae179..85dc39465 100644 --- a/cde/programs/dtfile/FileOp.c +++ b/cde/programs/dtfile/FileOp.c @@ -104,7 +104,6 @@ #include #include #include -#include #ifdef SHAPE #include diff --git a/cde/programs/dtfile/IconWindow.c b/cde/programs/dtfile/IconWindow.c index 71bb45657..71ed54285 100644 --- a/cde/programs/dtfile/IconWindow.c +++ b/cde/programs/dtfile/IconWindow.c @@ -72,6 +72,9 @@ #include #include +#ifndef XK_MISCELLANY +#define XK_MISCELLANY +#endif #include #include /* For HighlightBorder & UnhighlightBorder */ diff --git a/cde/programs/dtfile/Imakefile b/cde/programs/dtfile/Imakefile index d8003e719..112511239 100644 --- a/cde/programs/dtfile/Imakefile +++ b/cde/programs/dtfile/Imakefile @@ -9,7 +9,7 @@ ForceSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) -DEFINES = -DMULTIBYTE -DXK_MISCELLANY -DSHAPE -D_ILS_MACROS -DSUN_PERF \ +DEFINES = -DMULTIBYTE -DSHAPE -D_ILS_MACROS -DSUN_PERF \ -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \ -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \ -DKORNSHELL=\"$(KORNSHELL)\" diff --git a/cde/programs/dtfile/Main.c b/cde/programs/dtfile/Main.c index 9b2213304..0f077c489 100644 --- a/cde/programs/dtfile/Main.c +++ b/cde/programs/dtfile/Main.c @@ -152,7 +152,6 @@ #include #include #include -#include #ifdef HAVE_EDITRES #include #endif @@ -999,7 +998,6 @@ main( XtInputMask pending; Boolean eventDebugging; int offset; - KeySym keysym; int displayHeight; int displayWidth; Arg args[10]; diff --git a/cde/programs/dtfile/ToolTalk.c b/cde/programs/dtfile/ToolTalk.c index 87b29c03f..2bdebddfd 100644 --- a/cde/programs/dtfile/ToolTalk.c +++ b/cde/programs/dtfile/ToolTalk.c @@ -66,7 +66,6 @@ #include #include #include -#include #include
#include
diff --git a/cde/programs/dtfile/dtcopy/Imakefile b/cde/programs/dtfile/dtcopy/Imakefile index 31475b21d..1447adc9e 100644 --- a/cde/programs/dtfile/dtcopy/Imakefile +++ b/cde/programs/dtfile/dtcopy/Imakefile @@ -1,6 +1,6 @@ XCOMM $XConsortium: Imakefile /main/7 1996/09/14 15:17:43 drk $ -DEFINES = -DXK_MISCELLANY -DSHAPE +DEFINES = -DSHAPE DEPLIBS = DepDtClientLibs LOCAL_LIBRARIES = DtClientLibs diff --git a/cde/programs/dtinfo/tools/config/fujitsu.cf b/cde/programs/dtinfo/tools/config/fujitsu.cf index d2c8c3410..95db523f0 100644 --- a/cde/programs/dtinfo/tools/config/fujitsu.cf +++ b/cde/programs/dtinfo/tools/config/fujitsu.cf @@ -84,7 +84,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion) #define GencatFlags -m -#define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE -DNO_REGCOMP -DHAVE_PTMS +#define DtSvcDefines -DMULTIBYTE -DNO_REGCOMP -DHAVE_PTMS #define DtSearchDefines -DI18N_MSG DtSvcDefines -DNEED_STRCASECMP #define DtWidgetDefines DtSearchDefines diff --git a/cde/programs/dtinfo/tools/config/hp.cf b/cde/programs/dtinfo/tools/config/hp.cf index c39176998..d93828c22 100644 --- a/cde/programs/dtinfo/tools/config/hp.cf +++ b/cde/programs/dtinfo/tools/config/hp.cf @@ -192,7 +192,7 @@ XCOMM operating system: OSName (OSMajorVersion.OSMinorVersion.OSTeenyVersion) #define CdeCplusplusProjectDefines \ CdeBaseProjectDefines CplusplusAnsiDefines -#define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE -DMESSAGE_CAT +#define DtSvcDefines -DMULTIBYTE -DMESSAGE_CAT #define DtSearchDefines -DI18N_MSG DtSvcDefines #define DtWidgetDefines DtSearchDefines #define DtPrintDefines DtSearchDefines diff --git a/cde/programs/dtinfo/tools/config/osf1.cf b/cde/programs/dtinfo/tools/config/osf1.cf index 41ff46c13..c55248668 100644 --- a/cde/programs/dtinfo/tools/config/osf1.cf +++ b/cde/programs/dtinfo/tools/config/osf1.cf @@ -160,7 +160,7 @@ XCOMM operating system: OSName (OSMajorVersion.OSMinorVersion) #define LSBBitOrder YES #define MotifDefines -DNO_REGCOMP -DNO_REGEX -DSTRINGS_ALIGNED -#define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE -DMESSAGE_CAT +#define DtSvcDefines -DMULTIBYTE -DMESSAGE_CAT #define DtSearchDefines -DI18N_MSG DtSvcDefines #define DtWidgetDefines DtSearchDefines #define DtPrintDefines DtSearchDefines diff --git a/cde/programs/dtinfo/tools/config/sco.cf b/cde/programs/dtinfo/tools/config/sco.cf index b8e37e507..d97ce3c72 100644 --- a/cde/programs/dtinfo/tools/config/sco.cf +++ b/cde/programs/dtinfo/tools/config/sco.cf @@ -66,7 +66,7 @@ XCOMM #define ForceNormalLib YES #include /* minor changes to sv4Lib.rules */ #include -#define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE +#define DtSvcDefines -DMULTIBYTE #define DtSearchDefines -DI18N_MSG DtSvcDefines #define DtWidgetDefines DtSearchDefines #define DtPrintDefines DtSearchDefines diff --git a/cde/programs/dtinfo/tools/config/sun.cf b/cde/programs/dtinfo/tools/config/sun.cf index 6826d9d1a..d07aa84f4 100644 --- a/cde/programs/dtinfo/tools/config/sun.cf +++ b/cde/programs/dtinfo/tools/config/sun.cf @@ -341,7 +341,7 @@ man_keywords:: @@\ -DNO_ISDIR -DNO_REGCOMP -DNO_ALLOCA -DBOGUS_MB_MAX -DNO_CONST #define PamUnixDefines -DPAM_NIS #define TtLargePICTable YES -#define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE -DNO_REGCOMP +#define DtSvcDefines -DMULTIBYTE -DNO_REGCOMP #define DtSearchDefines -DI18N_MSG DtSvcDefines #define DtWidgetDefines DtSearchDefines #define DtPrintDefines DtSearchDefines diff --git a/cde/programs/dtinfo/tools/config/usl.cf b/cde/programs/dtinfo/tools/config/usl.cf index 24b70822d..87c7e9d84 100644 --- a/cde/programs/dtinfo/tools/config/usl.cf +++ b/cde/programs/dtinfo/tools/config/usl.cf @@ -83,7 +83,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVer #define XmDefines \ -DNO_REGCOMP -DNEED_STRCASECMP \ -DSUPPORT_ZERO_WIDTH -DHAS_WIDECHAR_FUNCTIONS -#define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE -DNO_REGCOMP +#define DtSvcDefines -DMULTIBYTE -DNO_REGCOMP #define DtSearchDefines -DI18N_MSG DtSvcDefines #define DtWidgetDefines DtSearchDefines #define DtPrintDefines DtSearchDefines diff --git a/cde/programs/dtpdm/Imakefile b/cde/programs/dtpdm/Imakefile index 2a3548625..23b82a99a 100644 --- a/cde/programs/dtpdm/Imakefile +++ b/cde/programs/dtpdm/Imakefile @@ -5,7 +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. */ -DEFINES = -DXK_MISCELLANY -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" -DI18N_MSG +DEFINES = -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" -DI18N_MSG INCLUDES = -I. /* DEPLIBS contains the list of library depencies for a client. diff --git a/cde/programs/util/dttypes/Imakefile b/cde/programs/util/dttypes/Imakefile index 877df0073..166fac6b2 100644 --- a/cde/programs/util/dttypes/Imakefile +++ b/cde/programs/util/dttypes/Imakefile @@ -1,6 +1,5 @@ XCOMM $XConsortium: Imakefile /main/8 1996/10/09 14:11:13 drk $ - DEFINES = -DXK_MISCELLANY INCLUDES = -I. DEPLIBS = $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB)