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

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

View File

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

View File

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

View File

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

View File

@@ -22,7 +22,7 @@ DependSubdirs($(SUBDIRS))
#include <Threads.tmpl>
#ifndef DtSvcDefines
# define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE
# define DtSvcDefines -DMULTIBYTE
#endif
DEFINES = DtSvcDefines