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/programs/dtinfo/tools/config/fujitsu.cf
View File

@@ -84,7 +84,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion)
#define GencatFlags -m
#define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE -DNO_REGCOMP -DHAVE_PTMS
#define DtSvcDefines -DMULTIBYTE -DNO_REGCOMP -DHAVE_PTMS
#define DtSearchDefines -DI18N_MSG DtSvcDefines -DNEED_STRCASECMP
#define DtWidgetDefines DtSearchDefines

2
cde/programs/dtinfo/tools/config/hp.cf
View File

@@ -192,7 +192,7 @@ XCOMM operating system: OSName (OSMajorVersion.OSMinorVersion.OSTeenyVersion)
#define CdeCplusplusProjectDefines \
CdeBaseProjectDefines CplusplusAnsiDefines
#define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE -DMESSAGE_CAT
#define DtSvcDefines -DMULTIBYTE -DMESSAGE_CAT
#define DtSearchDefines -DI18N_MSG DtSvcDefines
#define DtWidgetDefines DtSearchDefines
#define DtPrintDefines DtSearchDefines

2
cde/programs/dtinfo/tools/config/osf1.cf
View File

@@ -160,7 +160,7 @@ XCOMM operating system: OSName (OSMajorVersion.OSMinorVersion)
#define LSBBitOrder YES
#define MotifDefines -DNO_REGCOMP -DNO_REGEX -DSTRINGS_ALIGNED
#define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE -DMESSAGE_CAT
#define DtSvcDefines -DMULTIBYTE -DMESSAGE_CAT
#define DtSearchDefines -DI18N_MSG DtSvcDefines
#define DtWidgetDefines DtSearchDefines
#define DtPrintDefines DtSearchDefines

2
cde/programs/dtinfo/tools/config/sco.cf
View File

@@ -66,7 +66,7 @@ XCOMM #define ForceNormalLib YES
#include <scoLib.rules> /* minor changes to sv4Lib.rules */
#include <sv4Lib.rules>
#define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE
#define DtSvcDefines -DMULTIBYTE
#define DtSearchDefines -DI18N_MSG DtSvcDefines
#define DtWidgetDefines DtSearchDefines
#define DtPrintDefines DtSearchDefines

2
cde/programs/dtinfo/tools/config/sun.cf
View File

@@ -341,7 +341,7 @@ man_keywords:: @@\
-DNO_ISDIR -DNO_REGCOMP -DNO_ALLOCA -DBOGUS_MB_MAX -DNO_CONST
#define PamUnixDefines -DPAM_NIS
#define TtLargePICTable YES
#define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE -DNO_REGCOMP
#define DtSvcDefines -DMULTIBYTE -DNO_REGCOMP
#define DtSearchDefines -DI18N_MSG DtSvcDefines
#define DtWidgetDefines DtSearchDefines
#define DtPrintDefines DtSearchDefines

2
cde/programs/dtinfo/tools/config/usl.cf
View File

@@ -83,7 +83,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVer
#define XmDefines \
-DNO_REGCOMP -DNEED_STRCASECMP \
-DSUPPORT_ZERO_WIDTH -DHAS_WIDECHAR_FUNCTIONS
#define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE -DNO_REGCOMP
#define DtSvcDefines -DMULTIBYTE -DNO_REGCOMP
#define DtSearchDefines -DI18N_MSG DtSvcDefines
#define DtWidgetDefines DtSearchDefines
#define DtPrintDefines DtSearchDefines