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.
---
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 d2c8c34..95db523 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 c391769..d93828c 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 41ff46c..c552486 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 b8e37e5..d97ce3c 100644
--- 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 6826d9d..d07aa84 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 24b7082..87c7e9d 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 116d383..48102a8 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 fe709ee..3896772 100644
--- 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 3c2bcfe..a33c704 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 8265271..6070e60 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 e85e860..35edaa7 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 f84aea8..97e332e 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 49aa17c..5dc3f35 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 a7d729b..857a896 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 fb6ae3d..5ce7fba 100644
--- 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 87796b7..84429e2 100644
--- 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 cdc4616..c72ed3d 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 <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 239d5eb..0fa0238 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 <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 ca1613b..e3e9908 100644
--- 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 a0b9ebd..987d38f 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 a4f72e9..a8d82d7 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 6c80338..8cefb26 100644
--- 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 165284b..303d8ce 100644
--- 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 e835ae1..85dc394 100644
--- 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 71bb456..71ed542 100644
--- 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 d8003e7..1125112 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 9b22133..0f077c4 100644
--- 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 87b29c0..2bdebdd 100644
--- 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 31475b2..1447adc 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 d2c8c34..95db523 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 c391769..d93828c 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 41ff46c..c552486 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 b8e37e5..d97ce3c 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 <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 6826d9d..d07aa84 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 24b7082..87c7e9d 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 2a35486..23b82a9 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 877df00..166fac6 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)
--
1.7.9.2
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
