[PATCH 2-27] libX11: Purge macros NEED_EVENTS and NEED_REPLIES

Fernando Carrijo fcarrijo at yahoo.com.br
Thu Jul 1 02:50:47 PDT 2010 

Signed-off-by: Fernando Carrijo <fcarrijo at yahoo.com.br>
---
 include/X11/Xlibint.h         |    6 ------
 modules/im/ximcp/imDefFlt.c   |    1 -
 modules/im/ximcp/imDefIm.c    |    1 -
 modules/im/ximcp/imDefLkup.c  |    1 -
 modules/im/ximcp/imEvToWire.c |    2 --
 modules/im/ximcp/imExten.c    |    1 -
 modules/im/ximcp/imInsClbk.c  |    1 -
 modules/im/ximcp/imLcFlt.c    |    1 -
 modules/im/ximcp/imLcGIc.c    |    1 -
 modules/im/ximcp/imTrX.c      |    1 -
 modules/im/ximcp/imTrans.c    |    1 -
 src/AllCells.c                |    2 --
 src/AllPlanes.c               |    1 -
 src/ChkIfEv.c                 |    1 -
 src/ChkMaskEv.c               |    1 -
 src/ChkTypEv.c                |    1 -
 src/ChkTypWEv.c               |    1 -
 src/ChkWinEv.c                |    1 -
 src/EvToWire.c                |    2 --
 src/FilterEv.c                |    1 -
 src/Font.c                    |    1 -
 src/FontInfo.c                |    1 -
 src/FontNames.c               |    1 -
 src/GetAtomNm.c               |    1 -
 src/GetColor.c                |    1 -
 src/GetFPath.c                |    1 -
 src/GetGeom.c                 |    1 -
 src/GetHColor.c               |    1 -
 src/GetIFocus.c               |    1 -
 src/GetImage.c                |    1 -
 src/GetKCnt.c                 |    1 -
 src/GetMoEv.c                 |    1 -
 src/GetPCnt.c                 |    1 -
 src/GetPntMap.c               |    1 -
 src/GetProp.c                 |    1 -
 src/GetSOwner.c               |    1 -
 src/GetSSaver.c               |    1 -
 src/GetWAttrs.c               |    1 -
 src/GrKeybd.c                 |    1 -
 src/GrPointer.c               |    1 -
 src/Iconify.c                 |    1 -
 src/IfEvent.c                 |    1 -
 src/ImText.c                  |    1 -
 src/ImText16.c                |    1 -
 src/IntAtom.c                 |    1 -
 src/KeyBind.c                 |    1 -
 src/LiHosts.c                 |    1 -
 src/LiICmaps.c                |    1 -
 src/LiProps.c                 |    1 -
 src/ListExt.c                 |    1 -
 src/LookupCol.c               |    1 -
 src/MaskEvent.c               |    1 -
 src/ModMap.c                  |    1 -
 src/NextEvent.c               |    1 -
 src/OpenDis.c                 |    2 --
 src/ParseCol.c                |    1 -
 src/PeekEvent.c               |    1 -
 src/PeekIfEv.c                |    1 -
 src/PutBEvent.c               |    1 -
 src/QuBest.c                  |    1 -
 src/QuColor.c                 |    1 -
 src/QuColors.c                |    1 -
 src/QuCurShp.c                |    1 -
 src/QuExt.c                   |    1 -
 src/QuKeybd.c                 |    1 -
 src/QuPntr.c                  |    1 -
 src/QuStipShp.c               |    1 -
 src/QuTextE16.c               |    1 -
 src/QuTextExt.c               |    1 -
 src/QuTileShp.c               |    1 -
 src/QuTree.c                  |    1 -
 src/ReconfWM.c                |    2 --
 src/SendEvent.c               |    1 -
 src/SetPntMap.c               |    2 --
 src/Sync.c                    |    2 --
 src/TrCoords.c                |    1 -
 src/WinEvent.c                |    1 -
 src/Withdraw.c                |    1 -
 src/XlibAsync.c               |    1 -
 src/XlibInt.c                 |    2 --
 src/globals.c                 |    1 -
 src/imConv.c                  |    1 -
 src/xcms/cmsAllNCol.c         |    1 -
 src/xcms/cmsCmap.c            |    2 --
 src/xcms/cmsInt.c             |    1 -
 src/xcms/cmsLkCol.c           |    1 -
 src/xkb/XKB.c                 |    2 --
 src/xkb/XKBAlloc.c            |    4 ----
 src/xkb/XKBBell.c             |    2 --
 src/xkb/XKBBind.c             |    1 -
 src/xkb/XKBCompat.c           |    2 --
 src/xkb/XKBCtrls.c            |    2 --
 src/xkb/XKBCvt.c              |    1 -
 src/xkb/XKBExtDev.c           |    2 --
 src/xkb/XKBGAlloc.c           |    3 ---
 src/xkb/XKBGeom.c             |    2 --
 src/xkb/XKBGetByName.c        |    2 --
 src/xkb/XKBGetMap.c           |    3 ---
 src/xkb/XKBList.c             |    2 --
 src/xkb/XKBMAlloc.c           |    4 ----
 src/xkb/XKBMisc.c             |    4 ----
 src/xkb/XKBNames.c            |    2 --
 src/xkb/XKBRdBuf.c            |    2 --
 src/xkb/XKBSetGeom.c          |    2 --
 src/xkb/XKBSetMap.c           |    2 --
 src/xkb/XKBUse.c              |    2 --
 src/xkb/XKBleds.c             |    2 --
 src/xlibi18n/ICWrap.c         |    1 -
 src/xlibi18n/XDefaultIMIF.c   |    1 -
 109 files changed, 0 insertions(+), 150 deletions(-)

diff --git a/include/X11/Xlibint.h b/include/X11/Xlibint.h
index 0e97fd9..e765cc9 100644
--- a/include/X11/Xlibint.h
+++ b/include/X11/Xlibint.h
@@ -220,12 +220,6 @@ typedef struct _XSQEvent
 } _XQEvent;
 #endif
 
-#ifdef XTHREADS			/* for xReply */
-#define NEED_REPLIES
-#endif
-
-#define NEED_EVENTS
-#define NEED_REPLIES
 #include <X11/Xproto.h>
 #ifdef __sgi
 #define _SGI_MP_SOURCE  /* turn this on to get MP safe errno */
diff --git a/modules/im/ximcp/imDefFlt.c b/modules/im/ximcp/imDefFlt.c
index 9dad088..ee304c8 100644
--- a/modules/im/ximcp/imDefFlt.c
+++ b/modules/im/ximcp/imDefFlt.c
@@ -30,7 +30,6 @@ PERFORMANCE OF THIS SOFTWARE.
 #include <config.h>
 #endif
 #include <X11/Xatom.h>
-#define NEED_EVENTS
 #include "Xlibint.h"
 #include "Xutil.h"
 #include "Xlcint.h"
diff --git a/modules/im/ximcp/imDefIm.c b/modules/im/ximcp/imDefIm.c
index aa623ec..5d1fd02 100644
--- a/modules/im/ximcp/imDefIm.c
+++ b/modules/im/ximcp/imDefIm.c
@@ -55,7 +55,6 @@ PERFORMANCE OF THIS SOFTWARE.
 #include <config.h>
 #endif
 #include <X11/Xatom.h>
-#define NEED_EVENTS
 #include "Xlibint.h"
 #include "Xlcint.h"
 #include "XlcPublic.h"
diff --git a/modules/im/ximcp/imDefLkup.c b/modules/im/ximcp/imDefLkup.c
index 93631b6..f818faa 100644
--- a/modules/im/ximcp/imDefLkup.c
+++ b/modules/im/ximcp/imDefLkup.c
@@ -30,7 +30,6 @@ PERFORMANCE OF THIS SOFTWARE.
 #include <config.h>
 #endif
 #include <X11/Xatom.h>
-#define  NEED_EVENTS
 #include "Xlibint.h"
 #include "Xlcint.h"
 #include "Ximint.h"
diff --git a/modules/im/ximcp/imEvToWire.c b/modules/im/ximcp/imEvToWire.c
index bae5e7f..497c865 100644
--- a/modules/im/ximcp/imEvToWire.c
+++ b/modules/im/ximcp/imEvToWire.c
@@ -21,13 +21,11 @@ SOFTWARE.
 
 ******************************************************************/
 
-#define NEED_EVENTS
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 #include <X11/Xlibint.h>
 #include <X11/Xlib.h>
-#undef NEED_EVENTS
 #include "Ximint.h"
 
 
diff --git a/modules/im/ximcp/imExten.c b/modules/im/ximcp/imExten.c
index 199368c..946d780 100644
--- a/modules/im/ximcp/imExten.c
+++ b/modules/im/ximcp/imExten.c
@@ -30,7 +30,6 @@ PERFORMANCE OF THIS SOFTWARE.
 #include <config.h>
 #endif
 #include <X11/Xatom.h>
-#define NEED_EVENTS
 #include "Xlibint.h"
 #include "Xlcint.h"
 #include "Ximint.h"
diff --git a/modules/im/ximcp/imInsClbk.c b/modules/im/ximcp/imInsClbk.c
index 93a8552..68d56d5 100644
--- a/modules/im/ximcp/imInsClbk.c
+++ b/modules/im/ximcp/imInsClbk.c
@@ -30,7 +30,6 @@ PERFORMANCE OF THIS SOFTWARE.
 #include <config.h>
 #endif
 #include	<X11/Xatom.h>
-#define NEED_EVENTS
 #include	"Xlibint.h"
 #include	"Xlcint.h"
 #include	"XlcPublic.h"
diff --git a/modules/im/ximcp/imLcFlt.c b/modules/im/ximcp/imLcFlt.c
index cef4dbf..ae26fa8 100644
--- a/modules/im/ximcp/imLcFlt.c
+++ b/modules/im/ximcp/imLcFlt.c
@@ -29,7 +29,6 @@ PERFORMANCE OF THIS SOFTWARE.
 
 ******************************************************************/
 
-#define NEED_EVENTS
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/modules/im/ximcp/imLcGIc.c b/modules/im/ximcp/imLcGIc.c
index e3a4d10..26930c4 100644
--- a/modules/im/ximcp/imLcGIc.c
+++ b/modules/im/ximcp/imLcGIc.c
@@ -26,7 +26,6 @@ PERFORMANCE OF THIS SOFTWARE.
 
 ******************************************************************/
 
-#define NEED_EVENTS
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/modules/im/ximcp/imTrX.c b/modules/im/ximcp/imTrX.c
index 9bb3537..f5cc66e 100644
--- a/modules/im/ximcp/imTrX.c
+++ b/modules/im/ximcp/imTrX.c
@@ -54,7 +54,6 @@ PERFORMANCE OF THIS SOFTWARE.
 #endif
 #include <string.h>
 #include <X11/Xatom.h>
-#define NEED_EVENTS
 #include "Xlibint.h"
 #include "Xlcint.h"
 #include "Ximint.h"
diff --git a/modules/im/ximcp/imTrans.c b/modules/im/ximcp/imTrans.c
index a80100a..5462f37 100644
--- a/modules/im/ximcp/imTrans.c
+++ b/modules/im/ximcp/imTrans.c
@@ -55,7 +55,6 @@ PERFORMANCE OF THIS SOFTWARE.
 #include <stdio.h>
 #include <X11/Xatom.h>
 #include <X11/Xmd.h>
-#define NEED_EVENTS
 #include "Xlibint.h"
 #include <X11/Xtrans/Xtrans.h>
 #include "Xlcint.h"
diff --git a/src/AllCells.c b/src/AllCells.c
index 0c188aa..ddd9c22 100644
--- a/src/AllCells.c
+++ b/src/AllCells.c
@@ -24,8 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/AllPlanes.c b/src/AllPlanes.c
index 7d422a6..b2e2453 100644
--- a/src/AllPlanes.c
+++ b/src/AllPlanes.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/ChkIfEv.c b/src/ChkIfEv.c
index 5c1dd2b..876a850 100644
--- a/src/ChkIfEv.c
+++ b/src/ChkIfEv.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_EVENTS
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/ChkMaskEv.c b/src/ChkMaskEv.c
index 71f7246..78928e0 100644
--- a/src/ChkMaskEv.c
+++ b/src/ChkMaskEv.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_EVENTS
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/ChkTypEv.c b/src/ChkTypEv.c
index bb1dbe7..8ca1c80 100644
--- a/src/ChkTypEv.c
+++ b/src/ChkTypEv.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_EVENTS
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/ChkTypWEv.c b/src/ChkTypWEv.c
index e2fd6bf..92b3f5d 100644
--- a/src/ChkTypWEv.c
+++ b/src/ChkTypWEv.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_EVENTS
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/ChkWinEv.c b/src/ChkWinEv.c
index 683c8f1..9fb7db0 100644
--- a/src/ChkWinEv.c
+++ b/src/ChkWinEv.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_EVENTS
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/EvToWire.c b/src/EvToWire.c
index 77e70f3..4aca053 100644
--- a/src/EvToWire.c
+++ b/src/EvToWire.c
@@ -31,8 +31,6 @@ from The Open Group.
  *	XEvToWire.c - Internal support routines for the C subroutine
  *	interface library (Xlib) to the X Window System Protocol V11.0.
  */
-#define NEED_EVENTS
-#define NEED_REPLIES
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/src/FilterEv.c b/src/FilterEv.c
index 2611a7f..0a48e54 100644
--- a/src/FilterEv.c
+++ b/src/FilterEv.c
@@ -53,7 +53,6 @@ from The Open Group.
 
 */
 
-#define NEED_EVENTS
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #else
diff --git a/src/Font.c b/src/Font.c
index b664b8d..6a4c1e2 100644
--- a/src/Font.c
+++ b/src/Font.c
@@ -27,7 +27,6 @@ authorization from the X Consortium and the XFree86 Project.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/FontInfo.c b/src/FontInfo.c
index d1e9f02..a3ab65b 100644
--- a/src/FontInfo.c
+++ b/src/FontInfo.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/FontNames.c b/src/FontNames.c
index c073592..3018cf2 100644
--- a/src/FontNames.c
+++ b/src/FontNames.c
@@ -25,7 +25,6 @@ in this Software without prior written authorization from The Open Group.
 */
 
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/GetAtomNm.c b/src/GetAtomNm.c
index 169486b..9823c69 100644
--- a/src/GetAtomNm.c
+++ b/src/GetAtomNm.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/GetColor.c b/src/GetColor.c
index 1fa7960..cd0eb9f 100644
--- a/src/GetColor.c
+++ b/src/GetColor.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/GetFPath.c b/src/GetFPath.c
index 484d162..7d497c9 100644
--- a/src/GetFPath.c
+++ b/src/GetFPath.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/GetGeom.c b/src/GetGeom.c
index 9f55c21..1e1249d 100644
--- a/src/GetGeom.c
+++ b/src/GetGeom.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/GetHColor.c b/src/GetHColor.c
index 6bdd4fa..081a224 100644
--- a/src/GetHColor.c
+++ b/src/GetHColor.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/GetIFocus.c b/src/GetIFocus.c
index 815f21b..5d43ead 100644
--- a/src/GetIFocus.c
+++ b/src/GetIFocus.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/GetImage.c b/src/GetImage.c
index 602ba65..e8f1b03 100644
--- a/src/GetImage.c
+++ b/src/GetImage.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/GetKCnt.c b/src/GetKCnt.c
index 4ac69d1..17f487f 100644
--- a/src/GetKCnt.c
+++ b/src/GetKCnt.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/GetMoEv.c b/src/GetMoEv.c
index 05e2f04..3db176f 100644
--- a/src/GetMoEv.c
+++ b/src/GetMoEv.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/GetPCnt.c b/src/GetPCnt.c
index 474a691..2c35d21 100644
--- a/src/GetPCnt.c
+++ b/src/GetPCnt.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/GetPntMap.c b/src/GetPntMap.c
index 5f65ffe..0fcdb66 100644
--- a/src/GetPntMap.c
+++ b/src/GetPntMap.c
@@ -25,7 +25,6 @@ in this Software without prior written authorization from The Open Group.
 */
 
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/GetProp.c b/src/GetProp.c
index 75d772b..a80c19c 100644
--- a/src/GetProp.c
+++ b/src/GetProp.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/GetSOwner.c b/src/GetSOwner.c
index 2c93f2b..2258f8c 100644
--- a/src/GetSOwner.c
+++ b/src/GetSOwner.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/GetSSaver.c b/src/GetSSaver.c
index f63b4fe..1aba3bb 100644
--- a/src/GetSSaver.c
+++ b/src/GetSSaver.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/GetWAttrs.c b/src/GetWAttrs.c
index b0af60b..c10824c 100644
--- a/src/GetWAttrs.c
+++ b/src/GetWAttrs.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/GrKeybd.c b/src/GrKeybd.c
index f5d37a1..07dc841 100644
--- a/src/GrKeybd.c
+++ b/src/GrKeybd.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/GrPointer.c b/src/GrPointer.c
index 08d0f28..a0d9827 100644
--- a/src/GrPointer.c
+++ b/src/GrPointer.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/Iconify.c b/src/Iconify.c
index 3831102..3a969d7 100644
--- a/src/Iconify.c
+++ b/src/Iconify.c
@@ -49,7 +49,6 @@ from The Open Group.
 
 */
 
-#define NEED_EVENTS
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/IfEvent.c b/src/IfEvent.c
index e22ee5d..ead93dc 100644
--- a/src/IfEvent.c
+++ b/src/IfEvent.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_EVENTS
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/ImText.c b/src/ImText.c
index bbdc837..c12f268 100644
--- a/src/ImText.c
+++ b/src/ImText.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/ImText16.c b/src/ImText16.c
index 3338ec7..b0b6071 100644
--- a/src/ImText16.c
+++ b/src/ImText16.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/IntAtom.c b/src/IntAtom.c
index 5763ed7..7a56258 100644
--- a/src/IntAtom.c
+++ b/src/IntAtom.c
@@ -26,7 +26,6 @@ from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/KeyBind.c b/src/KeyBind.c
index 2bf2cb2..6d80a02 100644
--- a/src/KeyBind.c
+++ b/src/KeyBind.c
@@ -26,7 +26,6 @@ in this Software without prior written authorization from The Open Group.
 
 /* Beware, here be monsters (still under construction... - JG */
 
-#define NEED_EVENTS
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/LiHosts.c b/src/LiHosts.c
index ae9fa16..ec8e5f8 100644
--- a/src/LiHosts.c
+++ b/src/LiHosts.c
@@ -58,7 +58,6 @@ X Window System is a trademark of The Open Group.
 
 /* This can really be considered an os dependent routine */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/LiICmaps.c b/src/LiICmaps.c
index d2cb221..e981619 100644
--- a/src/LiICmaps.c
+++ b/src/LiICmaps.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/LiProps.c b/src/LiProps.c
index 344f990..72560ab 100644
--- a/src/LiProps.c
+++ b/src/LiProps.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/ListExt.c b/src/ListExt.c
index 5a41ec3..16b522e 100644
--- a/src/ListExt.c
+++ b/src/ListExt.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/LookupCol.c b/src/LookupCol.c
index 04c700e..f7f969f 100644
--- a/src/LookupCol.c
+++ b/src/LookupCol.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/MaskEvent.c b/src/MaskEvent.c
index ec1672b..cbc8ca1 100644
--- a/src/MaskEvent.c
+++ b/src/MaskEvent.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_EVENTS
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/ModMap.c b/src/ModMap.c
index 28c2da5..c99bfdd 100644
--- a/src/ModMap.c
+++ b/src/ModMap.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/NextEvent.c b/src/NextEvent.c
index 2865791..69b979b 100644
--- a/src/NextEvent.c
+++ b/src/NextEvent.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_EVENTS
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/OpenDis.c b/src/OpenDis.c
index 7d5d703..8de9556 100644
--- a/src/OpenDis.c
+++ b/src/OpenDis.c
@@ -24,8 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
-#define NEED_EVENTS
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/ParseCol.c b/src/ParseCol.c
index 5f9b09f..e997b1b 100644
--- a/src/ParseCol.c
+++ b/src/ParseCol.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/PeekEvent.c b/src/PeekEvent.c
index 3a7aebe..06546f0 100644
--- a/src/PeekEvent.c
+++ b/src/PeekEvent.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_EVENTS
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/PeekIfEv.c b/src/PeekIfEv.c
index 3421dd5..207cd11 100644
--- a/src/PeekIfEv.c
+++ b/src/PeekIfEv.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_EVENTS
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/PutBEvent.c b/src/PutBEvent.c
index 521df40..f9d4c29 100644
--- a/src/PutBEvent.c
+++ b/src/PutBEvent.c
@@ -27,7 +27,6 @@ from The Open Group.
 */
 
 /* XPutBackEvent puts an event back at the head of the queue. */
-#define NEED_EVENTS
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/QuBest.c b/src/QuBest.c
index 56b510d..97b1f11 100644
--- a/src/QuBest.c
+++ b/src/QuBest.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/QuColor.c b/src/QuColor.c
index 7aca7d7..4638095 100644
--- a/src/QuColor.c
+++ b/src/QuColor.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/QuColors.c b/src/QuColors.c
index 0df6f02..e51375f 100644
--- a/src/QuColors.c
+++ b/src/QuColors.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/QuCurShp.c b/src/QuCurShp.c
index 266e9be..bb17c42 100644
--- a/src/QuCurShp.c
+++ b/src/QuCurShp.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/QuExt.c b/src/QuExt.c
index ca94f04..4e230e7 100644
--- a/src/QuExt.c
+++ b/src/QuExt.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/QuKeybd.c b/src/QuKeybd.c
index a7446a2..4b8431d 100644
--- a/src/QuKeybd.c
+++ b/src/QuKeybd.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/QuPntr.c b/src/QuPntr.c
index d2968dc..e1379a6 100644
--- a/src/QuPntr.c
+++ b/src/QuPntr.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/QuStipShp.c b/src/QuStipShp.c
index 5a8d310..9f612fc 100644
--- a/src/QuStipShp.c
+++ b/src/QuStipShp.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/QuTextE16.c b/src/QuTextE16.c
index 67facd1..e458bc5 100644
--- a/src/QuTextE16.c
+++ b/src/QuTextE16.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/QuTextExt.c b/src/QuTextExt.c
index c94c11a..8a17dbb 100644
--- a/src/QuTextExt.c
+++ b/src/QuTextExt.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/QuTileShp.c b/src/QuTileShp.c
index 55360e7..f713f42 100644
--- a/src/QuTileShp.c
+++ b/src/QuTileShp.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/QuTree.c b/src/QuTree.c
index c40d081..3cea282 100644
--- a/src/QuTree.c
+++ b/src/QuTree.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/ReconfWM.c b/src/ReconfWM.c
index 3f68c34..1776f2e 100644
--- a/src/ReconfWM.c
+++ b/src/ReconfWM.c
@@ -26,8 +26,6 @@ from The Open Group.
 
 */
 
-#define NEED_EVENTS
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/SendEvent.c b/src/SendEvent.c
index 27e75ca..cc8bd5a 100644
--- a/src/SendEvent.c
+++ b/src/SendEvent.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_EVENTS
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/SetPntMap.c b/src/SetPntMap.c
index 94ed0c3..2e29201 100644
--- a/src/SetPntMap.c
+++ b/src/SetPntMap.c
@@ -24,8 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/Sync.c b/src/Sync.c
index 014cb1c..6326de7 100644
--- a/src/Sync.c
+++ b/src/Sync.c
@@ -24,8 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
-#define NEED_EVENTS
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/TrCoords.c b/src/TrCoords.c
index 26d33b7..77c1f06 100644
--- a/src/TrCoords.c
+++ b/src/TrCoords.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/WinEvent.c b/src/WinEvent.c
index 511cc18..c88c8da 100644
--- a/src/WinEvent.c
+++ b/src/WinEvent.c
@@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-#define NEED_EVENTS
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/Withdraw.c b/src/Withdraw.c
index 9e284e4..ac15ddc 100644
--- a/src/Withdraw.c
+++ b/src/Withdraw.c
@@ -49,7 +49,6 @@ from The Open Group.
 
 */
 
-#define NEED_EVENTS
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/XlibAsync.c b/src/XlibAsync.c
index b4483ef..b17135c 100644
--- a/src/XlibAsync.c
+++ b/src/XlibAsync.c
@@ -26,7 +26,6 @@ from The Open Group.
 
 */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/XlibInt.c b/src/XlibInt.c
index 4fb9397..11a85ba 100644
--- a/src/XlibInt.c
+++ b/src/XlibInt.c
@@ -30,8 +30,6 @@ from The Open Group.
  *	XlibInt.c - Internal support routines for the C subroutine
  *	interface library (Xlib) to the X Window System Protocol V11.0.
  */
-#define NEED_EVENTS
-#define NEED_REPLIES
 
 #ifdef WIN32
 #define _XLIBINT_
diff --git a/src/globals.c b/src/globals.c
index 415ee81..89e38a7 100644
--- a/src/globals.c
+++ b/src/globals.c
@@ -32,7 +32,6 @@ from The Open Group.
  *
  * This file should contain only those objects which must be predefined.
  */
-#define NEED_EVENTS
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/imConv.c b/src/imConv.c
index 4068b59..c3c1974 100644
--- a/src/imConv.c
+++ b/src/imConv.c
@@ -33,7 +33,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 /* 2000 Modifier: Ivan Pascal	The XFree86 Project.
  */
 
-#define NEED_EVENTS
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/xcms/cmsAllNCol.c b/src/xcms/cmsAllNCol.c
index 105e8bd..d39de6c 100644
--- a/src/xcms/cmsAllNCol.c
+++ b/src/xcms/cmsAllNCol.c
@@ -32,7 +32,6 @@
  *
  */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/xcms/cmsCmap.c b/src/xcms/cmsCmap.c
index f93a25b..00816ce 100644
--- a/src/xcms/cmsCmap.c
+++ b/src/xcms/cmsCmap.c
@@ -33,8 +33,6 @@
  *
  */
 
-#define NEED_EVENTS
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/xcms/cmsInt.c b/src/xcms/cmsInt.c
index b480365..b7c3214 100644
--- a/src/xcms/cmsInt.c
+++ b/src/xcms/cmsInt.c
@@ -34,7 +34,6 @@
  *
  */
 
-/* #define NEED_EVENTS */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/xcms/cmsLkCol.c b/src/xcms/cmsLkCol.c
index 776fffd..15e9874 100644
--- a/src/xcms/cmsLkCol.c
+++ b/src/xcms/cmsLkCol.c
@@ -32,7 +32,6 @@
  *
  */
 
-#define NEED_REPLIES
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/xkb/XKB.c b/src/xkb/XKB.c
index ad86b91..42dba99 100644
--- a/src/xkb/XKB.c
+++ b/src/xkb/XKB.c
@@ -28,8 +28,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <config.h>
 #endif
 #include <stdio.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
 #include "Xlibint.h"
 #include <X11/extensions/XKBproto.h>
 #include "XKBlibint.h"
diff --git a/src/xkb/XKBAlloc.c b/src/xkb/XKBAlloc.c
index bd615ea..05e9f73 100644
--- a/src/xkb/XKBAlloc.c
+++ b/src/xkb/XKBAlloc.c
@@ -33,8 +33,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifndef XKB_IN_SERVER
 
 #include <stdio.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
 #include "Xlibint.h"
 #include "XKBlibint.h"
 #include <X11/extensions/XKBgeom.h>
@@ -45,8 +43,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <stdio.h>
 #include <X11/X.h>
-#define	NEED_EVENTS
-#define	NEED_REPLIES
 #include <X11/Xproto.h>
 #include "misc.h"
 #include "inputstr.h"
diff --git a/src/xkb/XKBBell.c b/src/xkb/XKBBell.c
index 0054a5c..cf93ea7 100644
--- a/src/xkb/XKBBell.c
+++ b/src/xkb/XKBBell.c
@@ -28,8 +28,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <config.h>
 #endif
 #include <stdio.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
 #include "Xlibint.h"
 #include <X11/extensions/XKBproto.h>
 #include "XKBlibint.h"
diff --git a/src/xkb/XKBBind.c b/src/xkb/XKBBind.c
index 49cfffe..1c16adc 100644
--- a/src/xkb/XKBBind.c
+++ b/src/xkb/XKBBind.c
@@ -28,7 +28,6 @@ from The Open Group.
 
 	/* the new monsters ate the old ones */
 
-#define NEED_EVENTS
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/xkb/XKBCompat.c b/src/xkb/XKBCompat.c
index ba7f686..206b0c9 100644
--- a/src/xkb/XKBCompat.c
+++ b/src/xkb/XKBCompat.c
@@ -28,8 +28,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <config.h>
 #endif
 #include <stdio.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
 #define	NEED_MAP_READERS
 #include "Xlibint.h"
 #include <X11/extensions/XKBproto.h>
diff --git a/src/xkb/XKBCtrls.c b/src/xkb/XKBCtrls.c
index 3742c94..2b33b30 100644
--- a/src/xkb/XKBCtrls.c
+++ b/src/xkb/XKBCtrls.c
@@ -28,8 +28,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <config.h>
 #endif
 #include <stdio.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
 #include "Xlibint.h"
 #include <X11/extensions/XKBproto.h>
 #include "XKBlibint.h"
diff --git a/src/xkb/XKBCvt.c b/src/xkb/XKBCvt.c
index b2621a9..da74fc0 100644
--- a/src/xkb/XKBCvt.c
+++ b/src/xkb/XKBCvt.c
@@ -35,7 +35,6 @@ from The Open Group.
 
 #include <X11/X.h>
 #include <X11/Xlib.h>
-#define NEED_EVENTS
 #include "Xlibint.h"
 #include "Xlcint.h"
 #include "XlcPubI.h"
diff --git a/src/xkb/XKBExtDev.c b/src/xkb/XKBExtDev.c
index e8157b9..353e769 100644
--- a/src/xkb/XKBExtDev.c
+++ b/src/xkb/XKBExtDev.c
@@ -28,8 +28,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <config.h>
 #endif
 #include <stdio.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
 #define	NEED_MAP_READERS
 #include "Xlibint.h"
 #include <X11/extensions/XKBproto.h>
diff --git a/src/xkb/XKBGAlloc.c b/src/xkb/XKBGAlloc.c
index 8f163c3..17d13be 100644
--- a/src/xkb/XKBGAlloc.c
+++ b/src/xkb/XKBGAlloc.c
@@ -30,9 +30,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <config.h>
 #endif
 
-#define	NEED_EVENTS
-#define	NEED_REPLIES
-
 #ifndef XKB_IN_SERVER
 
 #include <stdio.h>
diff --git a/src/xkb/XKBGeom.c b/src/xkb/XKBGeom.c
index 2742313..e9e36d0 100644
--- a/src/xkb/XKBGeom.c
+++ b/src/xkb/XKBGeom.c
@@ -31,8 +31,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <stdio.h>
 #endif
 
-#define NEED_EVENTS
-#define NEED_REPLIES
 #define NEED_MAP_READERS
 #include "Xlibint.h"
 #include <X11/extensions/XKBgeom.h>
diff --git a/src/xkb/XKBGetByName.c b/src/xkb/XKBGetByName.c
index 15d0338..8e4f554 100644
--- a/src/xkb/XKBGetByName.c
+++ b/src/xkb/XKBGetByName.c
@@ -24,8 +24,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
-#define NEED_REPLIES
-#define NEED_EVENTS
 #define	NEED_MAP_READERS
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/src/xkb/XKBGetMap.c b/src/xkb/XKBGetMap.c
index c0d3c17..30fb629 100644
--- a/src/xkb/XKBGetMap.c
+++ b/src/xkb/XKBGetMap.c
@@ -24,9 +24,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
-
-#define NEED_REPLIES
-#define NEED_EVENTS
 #define	NEED_MAP_READERS
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/src/xkb/XKBList.c b/src/xkb/XKBList.c
index f202d93..e1b4127 100644
--- a/src/xkb/XKBList.c
+++ b/src/xkb/XKBList.c
@@ -24,8 +24,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
-#define NEED_REPLIES
-#define NEED_EVENTS
 #define	NEED_MAP_READERS
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/src/xkb/XKBMAlloc.c b/src/xkb/XKBMAlloc.c
index 3ed9c7b..a6b3921 100644
--- a/src/xkb/XKBMAlloc.c
+++ b/src/xkb/XKBMAlloc.c
@@ -33,8 +33,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifndef XKB_IN_SERVER
 
 #include <stdio.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
 #include "Xlibint.h"
 #include <X11/extensions/XKBproto.h>
 #include <X11/keysym.h>
@@ -44,8 +42,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <stdio.h>
 #include <X11/X.h>
-#define	NEED_EVENTS
-#define	NEED_REPLIES
 #include <X11/Xproto.h>
 #include "misc.h"
 #include "inputstr.h"
diff --git a/src/xkb/XKBMisc.c b/src/xkb/XKBMisc.c
index 587d8f9..fc5ae5f 100644
--- a/src/xkb/XKBMisc.c
+++ b/src/xkb/XKBMisc.c
@@ -33,8 +33,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifndef XKB_IN_SERVER
 
 #include <stdio.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
 #include "Xlibint.h"
 #include <X11/extensions/XKBproto.h>
 #include <X11/keysym.h>
@@ -44,8 +42,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <stdio.h>
 #include <X11/X.h>
-#define	NEED_EVENTS
-#define	NEED_REPLIES
 #include <X11/Xproto.h>
 #include "misc.h"
 #include "inputstr.h"
diff --git a/src/xkb/XKBNames.c b/src/xkb/XKBNames.c
index b07f73c..cf2382c 100644
--- a/src/xkb/XKBNames.c
+++ b/src/xkb/XKBNames.c
@@ -24,8 +24,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
-#define NEED_REPLIES
-#define NEED_EVENTS
 #define NEED_MAP_READERS
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/src/xkb/XKBRdBuf.c b/src/xkb/XKBRdBuf.c
index 6d1f672..3023a32 100644
--- a/src/xkb/XKBRdBuf.c
+++ b/src/xkb/XKBRdBuf.c
@@ -28,8 +28,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <config.h>
 #endif
 #include <stdio.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
 #include "Xlibint.h"
 #include "XKBlibint.h"
 #include <X11/extensions/XKBproto.h>
diff --git a/src/xkb/XKBSetGeom.c b/src/xkb/XKBSetGeom.c
index aa6046c..ab76a20 100644
--- a/src/xkb/XKBSetGeom.c
+++ b/src/xkb/XKBSetGeom.c
@@ -31,8 +31,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <stdio.h>
 #endif
 
-#define NEED_EVENTS
-#define NEED_REPLIES
 #include "Xlibint.h"
 #include "XKBlibint.h"
 #include <X11/extensions/XKBgeom.h>
diff --git a/src/xkb/XKBSetMap.c b/src/xkb/XKBSetMap.c
index bd46e1f..cad9364 100644
--- a/src/xkb/XKBSetMap.c
+++ b/src/xkb/XKBSetMap.c
@@ -28,8 +28,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <config.h>
 #endif
 #include <stdio.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
 #include "Xlibint.h"
 #include <X11/extensions/XKBproto.h>
 #include "XKBlibint.h"
diff --git a/src/xkb/XKBUse.c b/src/xkb/XKBUse.c
index 562e0f0..05dcfc1 100644
--- a/src/xkb/XKBUse.c
+++ b/src/xkb/XKBUse.c
@@ -29,8 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #endif
 #include <stdio.h>
 #include <ctype.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
 #include "Xlibint.h"
 #include <X11/extensions/XKBproto.h>
 #include "XKBlibint.h"
diff --git a/src/xkb/XKBleds.c b/src/xkb/XKBleds.c
index 24a42c3..d9b743c 100644
--- a/src/xkb/XKBleds.c
+++ b/src/xkb/XKBleds.c
@@ -24,8 +24,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
-#define NEED_REPLIES
-#define NEED_EVENTS
 #define NEED_MAP_READERS
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/src/xlibi18n/ICWrap.c b/src/xlibi18n/ICWrap.c
index 018f89a..1eacfa5 100644
--- a/src/xlibi18n/ICWrap.c
+++ b/src/xlibi18n/ICWrap.c
@@ -61,7 +61,6 @@ from The Open Group.
 
 */
 
-#define NEED_EVENTS
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/xlibi18n/XDefaultIMIF.c b/src/xlibi18n/XDefaultIMIF.c
index de17d20..d36962f 100644
--- a/src/xlibi18n/XDefaultIMIF.c
+++ b/src/xlibi18n/XDefaultIMIF.c
@@ -64,7 +64,6 @@ Sun Microsystems, Inc. or its licensors is granted.
 #include <config.h>
 #endif
 #include <stdio.h>
-#define NEED_EVENTS
 #include "Xlibint.h"
 #include "Xlcint.h"
 #include "XlcGeneric.h"
-- 
1.7.0.4

More information about the xorg-devel mailing list