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
<command-line>: warning: this is the location of the previous definition

<keysym.h> which includes all key symbols and loads <keysymdef.h>
is automaticlly included by the X Toolkit.

This patch removes #include <keysymdef.h> whenever not needed,
and adds #define XK_MISCALLANY in the source code where required.

diff --git a/cde/config/cf/fujitsu.cf b/cde/config/cf/fujitsu.cf
index d2c8c3410930f5ec615d421c1340f74bf364e40a..95db523f0c53b0388153ad43a1cdff54db156756 100644 (file)
--- 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 c39176998f5546e2fc612dcdbb10017355afe60f..d93828c22b003ce32e9ea563addc6d964c03edae 100644 (file)
--- 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 41ff46c13cc3988ab8c4362c505a69987224c374..c55248668510ffa1ba7652371e91b5dee6fd3536 100644 (file)
--- 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 b8e37e50716243a887c71e4da22d7226f9db66fb..d97ce3c723e53c5432794226ae9d5103813b6528 100644 (file)
--- a/cde/config/cf/sco.cf
+++ b/cde/config/cf/sco.cf
@@ -66,7 +66,7 @@ XCOMM #define ForceNormalLib          YES
 #include <scoLib.rules>  /* minor changes to sv4Lib.rules */
 #include <sv4Lib.rules>
 
-#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 6826d9d1ae9ce3f5b51e39179baf7f0b938f7394..d07aa84f4aba0a08f4d06b600eb5035e41f165da 100644 (file)
--- 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 24b70822dba3e33b48b476def84349c1813dc0ac..87c7e9d84e58b25c5ead5fd3c7a67e77c1eaf170 100644 (file)
--- 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 116d3832d4cea6485ea51e3d76b12ef40e850ff9..48102a849541f7c820e710df32ee90d65c85c0d1 100644 (file)
--- 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 fe709ee403f689f844ac36b28d2bf8224e213ea7..38967729e62c5bdca34d34a7ad689382c8a7edd0 100644 (file)
--- a/cde/lib/DtHelp/HelpUtil.c
+++ b/cde/lib/DtHelp/HelpUtil.c
@@ -59,7 +59,6 @@
 #include <Xm/MwmUtil.h>
 
 #include <Xm/MessageB.h>
-#include <X11/keysymdef.h>
 #include <X11/Shell.h>
 #include <X11/Intrinsic.h>
 #include <X11/cursorfont.h>

diff --git a/cde/lib/DtHelp/Imakefile b/cde/lib/DtHelp/Imakefile
index 3c2bcfe0a2458681848052d48fb06bae1fc9e094..a33c70468b1ad9d0c9a5486130acb1151b7d9bca 100644 (file)
--- 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 8265271c3467e08711fda4a3e7bec278cf386cd4..6070e607b83205df7699b0115b206e7042b3f18d 100644 (file)
--- 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 e85e860683267323ca19db29902c5fca092c57aa..35edaa74b7f3645a1620b0b9a4c5667eb4158a7f 100644 (file)
--- 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 f84aea8482b798897d178e53e05dede112705824..97e332eb9fe188a23a4e18a00732910f7214888f 100644 (file)
--- 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 49aa17cc548ba7bd51d141788013ce469c9d8e92..5dc3f35595c9b8141c008aace99e0b7776e3c039 100644 (file)
--- 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 a7d729bd2d4f8e4a8241e3b713cf6b36b0f3c638..857a896970d0ea2c4ab4f6150a6a4d7d008a8de0 100644 (file)
--- 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 fb6ae3d5887a3b5e354ceaf9e831200cc586914b..5ce7fba1599f35b98700bb7d98c9e8dafa1a5d44 100644 (file)
--- a/cde/lib/DtSvc/DtCodelibs/Imakefile
+++ b/cde/lib/DtSvc/DtCodelibs/Imakefile
@@ -22,7 +22,7 @@ DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
 #include <Threads.tmpl>
 
 #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 87796b77b7d0409e9b6d34ef03bf2b88c08c8037..84429e250ea9350171c8623749b291be906a8ae4 100644 (file)
--- a/cde/lib/DtSvc/DtEncap/Imakefile
+++ b/cde/lib/DtSvc/DtEncap/Imakefile
@@ -19,7 +19,7 @@ XCOMM (c) Copyright 1996 Hitachi.
 #include <Threads.tmpl>
 
 #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 cdc461637c0efadf99352055a7ae3b2997de30e3..c72ed3dab93e329a8a52c46a971a9118bfdcd553 100644 (file)
--- 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 <Threads.tmpl>
 
 #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 239d5ebba7e56f77ef470172b0c000d0ad3256a7..0fa0238c60b76d10e4f3ce48b3bcb866f218e7c5 100644 (file)
--- 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 <Threads.tmpl>
 
 #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 ca1613bebd9aab35647960fb177e3f9560fdbf01..e3e9908bf5457c2130919e13db4501fad29e69b3 100644 (file)
--- a/cde/lib/DtSvc/Imakefile
+++ b/cde/lib/DtSvc/Imakefile
@@ -22,7 +22,7 @@ DependSubdirs($(SUBDIRS))
 #include <Threads.tmpl>
 
 #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 a0b9ebd93e5dc56497f10a482a31f4e3c525f2e1..987d38fa0de3e155ce6c488b25a465920c41c273 100644 (file)
--- 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 a4f72e906df4092266fa02877773d3f76fb5eeae..a8d82d7d8f683d505c05cc8ac7d37e19afc6f511 100644 (file)
--- 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 6c80338d29b56204af25179e688a52f6d68b94a2..8cefb266fb2838770ee3637a635b38aedf4f85bb 100644 (file)
--- a/cde/programs/dtfile/File.c
+++ b/cde/programs/dtfile/File.c
@@ -159,6 +159,9 @@
 #include <X11/Shell.h>
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
+#ifndef XK_MISCELLANY
+#define XK_MISCELLANY
+#endif
 #include <X11/keysymdef.h>
 
 #ifdef SHAPE

diff --git a/cde/programs/dtfile/FileMgr.c b/cde/programs/dtfile/FileMgr.c
index 165284bca6fc19821d0cf9573150296e9313b2a3..303d8ce0810799fdbe3b78b68e777633a3bf9d42 100644 (file)
--- a/cde/programs/dtfile/FileMgr.c
+++ b/cde/programs/dtfile/FileMgr.c
@@ -132,7 +132,6 @@
 #include <X11/ShellP.h>
 #include <X11/Shell.h>
 #include <X11/Xatom.h>
-#include <X11/keysymdef.h>
 
 #include <Xm/Protocols.h>
 

diff --git a/cde/programs/dtfile/FileOp.c b/cde/programs/dtfile/FileOp.c
index e835ae179b714f679549615896656d20fc5a0768..85dc39465da4fa3374b7308bc04c67bd633d0447 100644 (file)
--- a/cde/programs/dtfile/FileOp.c
+++ b/cde/programs/dtfile/FileOp.c
@@ -104,7 +104,6 @@
 #include <X11/Shell.h>
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
-#include <X11/keysymdef.h>
 
 #ifdef SHAPE
 #include <X11/extensions/shape.h>

diff --git a/cde/programs/dtfile/IconWindow.c b/cde/programs/dtfile/IconWindow.c
index 71bb45657f6fe56d4503482c61e52709077e0ef5..71ed54285bd657f5c92b2406955fb1ecdcc39f76 100644 (file)
--- a/cde/programs/dtfile/IconWindow.c
+++ b/cde/programs/dtfile/IconWindow.c
@@ -72,6 +72,9 @@
 
 #include <X11/cursorfont.h>
 #include <X11/Xutil.h>
+#ifndef  XK_MISCELLANY
+#define  XK_MISCELLANY
+#endif
 #include <X11/keysymdef.h>
 #include <Xm/PrimitiveP.h>  /* For HighlightBorder & UnhighlightBorder */
 

diff --git a/cde/programs/dtfile/Imakefile b/cde/programs/dtfile/Imakefile
index d8003e719f300cfa489fb0e55aebd2fa5ff4aa26..112511239276288bb8d4fb56dd58cc938e3364c5 100644 (file)
--- 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 9b2213304809108bdc0b8846e4a3002a5e9d013e..0f077c489289d937cb56bb47f270572ac2e19372 100644 (file)
--- a/cde/programs/dtfile/Main.c
+++ b/cde/programs/dtfile/Main.c
@@ -152,7 +152,6 @@
 #include <X11/Shell.h>
 #include <X11/Xatom.h>
 #include <Xm/Protocols.h>
-#include <X11/keysymdef.h>
 #ifdef HAVE_EDITRES
 #include <X11/Xmu/Editres.h>
 #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 87b29c03f95620375a01ee530aec6f1659cff19e..2bdebddfdfecb7909bdc350bd159b1ed1198c61e 100644 (file)
--- a/cde/programs/dtfile/ToolTalk.c
+++ b/cde/programs/dtfile/ToolTalk.c
@@ -66,7 +66,6 @@
 #include <X11/Shell.h>
 #include <X11/Xatom.h>
 #include <Xm/Protocols.h>
-#include <X11/keysymdef.h>
 
 #include <Dt/Session.h>
 #include <Dt/DtP.h>

diff --git a/cde/programs/dtfile/dtcopy/Imakefile b/cde/programs/dtfile/dtcopy/Imakefile
index 31475b21d7905e0dc07ad878fac828b055b44d0d..1447adc9e37d3189ed5793c574da341235787b44 100644 (file)
--- 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 d2c8c3410930f5ec615d421c1340f74bf364e40a..95db523f0c53b0388153ad43a1cdff54db156756 100644 (file)
--- 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 c39176998f5546e2fc612dcdbb10017355afe60f..d93828c22b003ce32e9ea563addc6d964c03edae 100644 (file)
--- 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 41ff46c13cc3988ab8c4362c505a69987224c374..c55248668510ffa1ba7652371e91b5dee6fd3536 100644 (file)
--- 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 b8e37e50716243a887c71e4da22d7226f9db66fb..d97ce3c723e53c5432794226ae9d5103813b6528 100644 (file)
--- 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 <scoLib.rules>  /* minor changes to sv4Lib.rules */
 #include <sv4Lib.rules>
 
-#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 6826d9d1ae9ce3f5b51e39179baf7f0b938f7394..d07aa84f4aba0a08f4d06b600eb5035e41f165da 100644 (file)
--- 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 24b70822dba3e33b48b476def84349c1813dc0ac..87c7e9d84e58b25c5ead5fd3c7a67e77c1eaf170 100644 (file)
--- 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 2a3548625e0fe9487a280ca7a990d9c8484a23b7..23b82a99a803242430cf73b7571215525758c6e7 100644 (file)
--- 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 877df0073b39c7a90c1eb9a7dfef403e26a1544e..166fac6b2532a7a707b4bf4379c403d14d7638d8 100644 (file)
--- 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)