debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

157 warnings: remove -DXK_MISCELLANY from Makefiles

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
cde/lib/DtHelp/il/Imakefile
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)"' \