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/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

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>
 

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>

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 */
 

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

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];

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>

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