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.
This commit is contained in:
Marcin Cieslak
2012-09-24 17:52:58 +02:00
committed by Jon Trulson
parent c70978e986
commit 917f7da191
37 changed files with 33 additions and 37 deletions

View File

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

View File

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

View File

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

View File

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