external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00
Code Issues 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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cde/config/cf/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/config/cf/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/config/cf/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/config/cf/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/config/cf/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/config/cf/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/examples/dtprint/Imakefile
View file

@ -6,7 +6,7 @@ DESKTOP_VERSION_STRING = DesktopVersionString
* 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)\"
DEFINES = -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\"
INCLUDES = -I.
/* DEPLIBS contains the list of library depencies for a client.

1
cde/lib/DtHelp/HelpUtil.c
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>

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

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

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

2
cde/lib/DtPrint/Imakefile
View file

@ -8,7 +8,7 @@ XCOMM $XConsortium: Imakefile /main/11 1996/10/31 02:09:04 cde-hp $
#define IncSubdir Dt
#ifndef DtPrintDefines
# define DtPrintDefines -DXK_MISCELLANY -DMULTIBYTE -DI18N_MSG
# define DtPrintDefines -DMULTIBYTE -DI18N_MSG
#endif
DEFINES = DtPrintDefines
INCLUDES = -I.

2
cde/lib/DtSearch/Imakefile
View file

@ -26,7 +26,7 @@ DependSubdirs($(SUBDIRS))
#define IncSubdir Dt
#ifndef DtSearchDefines
# define DtSearchDefines -DI18N_MSG -DXK_MISCELLANY -DMULTIBYTE
# define DtSearchDefines -DI18N_MSG -DMULTIBYTE
#endif
DEFINES = DtSearchDefines
INCLUDES = -I. -I./raima

2
cde/lib/DtSearch/raima/Imakefile
View file

@ -33,7 +33,7 @@ EXTRA_DEFINES = -D_XOPEN_SOURCE
#define LibCreate NO
#ifndef DtSvcDefines
# define DtSvcDefines -DXK_MISCELLANY -DMULTIBYTE
# define DtSvcDefines -DMULTIBYTE
#endif
DEFINES = DtSvcDefines \
-DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \

2
cde/lib/DtSvc/DtCodelibs/Imakefile
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

2
cde/lib/DtSvc/DtEncap/Imakefile
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)\" \

2
cde/lib/DtSvc/DtUtil1/Imakefile
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)\" \

2
cde/lib/DtSvc/DtUtil2/Imakefile
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)\" \

2
cde/lib/DtSvc/Imakefile
View file

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

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)