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

1
cde/programs/dtaction/Imakefile
View File

@@ -1,6 +1,5 @@
XCOMM $TOG: Imakefile /main/9 1998/04/06 13:11:38 mgreess $
DEFINES = -DXK_MISCELLANY
INCLUDES = -I.
DEPLIBS = $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB)

2
cde/programs/dtdbcache/Imakefile
View File

@@ -9,8 +9,6 @@ XCOMM $XConsortium: Imakefile /main/5 1996/09/14 15:26:52 drk $
* It should be set when necessary to the real library macro name.
*/
DEFINES = -DXK_MISCELLANY
INCLUDES = -I.
/* DEPLIBS contains the list of library depencies for a client.

3
cde/programs/dtfile/File.c
View File

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

1
cde/programs/dtfile/FileMgr.c
View File

@@ -132,7 +132,6 @@
#include <X11/ShellP.h>
#include <X11/Shell.h>
#include <X11/Xatom.h>
#include <X11/keysymdef.h>
#include <Xm/Protocols.h>

1
cde/programs/dtfile/FileOp.c
View File

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

3
cde/programs/dtfile/IconWindow.c
View File

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

2
cde/programs/dtfile/Imakefile
View File

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

2
cde/programs/dtfile/Main.c
View File

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

1
cde/programs/dtfile/ToolTalk.c
View File

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

2
cde/programs/dtfile/dtcopy/Imakefile
View File

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

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

2
cde/programs/dtpdm/Imakefile
View File

@@ -5,7 +5,7 @@ XCOMM $XConsortium: Imakefile /main/7 1996/10/09 14:13:27 drk $
* USE_libraryname in LOCAL_LIBRARIES is by default empty.
* It should be set when necessary to the real library macro name.
*/
DEFINES = -DXK_MISCELLANY -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" -DI18N_MSG
DEFINES = -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" -DI18N_MSG
INCLUDES = -I.
/* DEPLIBS contains the list of library depencies for a client.

1
cde/programs/util/dttypes/Imakefile
View File

@@ -1,6 +1,5 @@
XCOMM $XConsortium: Imakefile /main/8 1996/10/09 14:11:13 drk $
DEFINES = -DXK_MISCELLANY
INCLUDES = -I.
DEPLIBS = $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB)