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.

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>

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)"' \

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)"' \

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)"' \

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.

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

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)\" \

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

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)\" \

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)\" \

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)\" \

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