summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFernando Carrijo <fcarrijo@yahoo.com.br>2010-07-01 06:50:47 -0300
committerAlan Coopersmith <alan.coopersmith@oracle.com>2010-07-07 15:12:34 -0700
commit6de368c9aa7ccd2fcd62fca5a2b278913db4d03d (patch)
tree51f9c62f0bda838e963c1feba3517dd2381f383a
parent0b724231be17f19538ee115a03b82b221b1f83c0 (diff)
Purge macros NEED_EVENTS and NEED_REPLIES
Signed-off-by: Fernando Carrijo <fcarrijo@yahoo.com.br> Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--include/X11/Xlibint.h6
-rw-r--r--modules/im/ximcp/imDefFlt.c1
-rw-r--r--modules/im/ximcp/imDefIm.c1
-rw-r--r--modules/im/ximcp/imDefLkup.c1
-rw-r--r--modules/im/ximcp/imEvToWire.c2
-rw-r--r--modules/im/ximcp/imExten.c1
-rw-r--r--modules/im/ximcp/imInsClbk.c1
-rw-r--r--modules/im/ximcp/imLcFlt.c1
-rw-r--r--modules/im/ximcp/imLcGIc.c1
-rw-r--r--modules/im/ximcp/imTrX.c1
-rw-r--r--modules/im/ximcp/imTrans.c1
-rw-r--r--src/AllCells.c2
-rw-r--r--src/AllPlanes.c1
-rw-r--r--src/ChkIfEv.c1
-rw-r--r--src/ChkMaskEv.c1
-rw-r--r--src/ChkTypEv.c1
-rw-r--r--src/ChkTypWEv.c1
-rw-r--r--src/ChkWinEv.c1
-rw-r--r--src/EvToWire.c2
-rw-r--r--src/FilterEv.c1
-rw-r--r--src/Font.c1
-rw-r--r--src/FontInfo.c1
-rw-r--r--src/FontNames.c1
-rw-r--r--src/GetAtomNm.c1
-rw-r--r--src/GetColor.c1
-rw-r--r--src/GetFPath.c1
-rw-r--r--src/GetGeom.c1
-rw-r--r--src/GetHColor.c1
-rw-r--r--src/GetIFocus.c1
-rw-r--r--src/GetImage.c1
-rw-r--r--src/GetKCnt.c1
-rw-r--r--src/GetMoEv.c1
-rw-r--r--src/GetPCnt.c1
-rw-r--r--src/GetPntMap.c1
-rw-r--r--src/GetProp.c1
-rw-r--r--src/GetSOwner.c1
-rw-r--r--src/GetSSaver.c1
-rw-r--r--src/GetWAttrs.c1
-rw-r--r--src/GrKeybd.c1
-rw-r--r--src/GrPointer.c1
-rw-r--r--src/Iconify.c1
-rw-r--r--src/IfEvent.c1
-rw-r--r--src/ImText.c1
-rw-r--r--src/ImText16.c1
-rw-r--r--src/IntAtom.c1
-rw-r--r--src/KeyBind.c1
-rw-r--r--src/LiHosts.c1
-rw-r--r--src/LiICmaps.c1
-rw-r--r--src/LiProps.c1
-rw-r--r--src/ListExt.c1
-rw-r--r--src/LookupCol.c1
-rw-r--r--src/MaskEvent.c1
-rw-r--r--src/ModMap.c1
-rw-r--r--src/NextEvent.c1
-rw-r--r--src/OpenDis.c2
-rw-r--r--src/ParseCol.c1
-rw-r--r--src/PeekEvent.c1
-rw-r--r--src/PeekIfEv.c1
-rw-r--r--src/PutBEvent.c1
-rw-r--r--src/QuBest.c1
-rw-r--r--src/QuColor.c1
-rw-r--r--src/QuColors.c1
-rw-r--r--src/QuCurShp.c1
-rw-r--r--src/QuExt.c1
-rw-r--r--src/QuKeybd.c1
-rw-r--r--src/QuPntr.c1
-rw-r--r--src/QuStipShp.c1
-rw-r--r--src/QuTextE16.c1
-rw-r--r--src/QuTextExt.c1
-rw-r--r--src/QuTileShp.c1
-rw-r--r--src/QuTree.c1
-rw-r--r--src/ReconfWM.c2
-rw-r--r--src/SendEvent.c1
-rw-r--r--src/SetPntMap.c2
-rw-r--r--src/Sync.c2
-rw-r--r--src/TrCoords.c1
-rw-r--r--src/WinEvent.c1
-rw-r--r--src/Withdraw.c1
-rw-r--r--src/XlibAsync.c1
-rw-r--r--src/XlibInt.c2
-rw-r--r--src/globals.c1
-rw-r--r--src/imConv.c1
-rw-r--r--src/xcms/cmsAllNCol.c1
-rw-r--r--src/xcms/cmsCmap.c2
-rw-r--r--src/xcms/cmsInt.c1
-rw-r--r--src/xcms/cmsLkCol.c1
-rw-r--r--src/xkb/XKB.c2
-rw-r--r--src/xkb/XKBAlloc.c4
-rw-r--r--src/xkb/XKBBell.c2
-rw-r--r--src/xkb/XKBBind.c1
-rw-r--r--src/xkb/XKBCompat.c2
-rw-r--r--src/xkb/XKBCtrls.c2
-rw-r--r--src/xkb/XKBCvt.c1
-rw-r--r--src/xkb/XKBExtDev.c2
-rw-r--r--src/xkb/XKBGAlloc.c3
-rw-r--r--src/xkb/XKBGeom.c2
-rw-r--r--src/xkb/XKBGetByName.c2
-rw-r--r--src/xkb/XKBGetMap.c3
-rw-r--r--src/xkb/XKBList.c2
-rw-r--r--src/xkb/XKBMAlloc.c4
-rw-r--r--src/xkb/XKBMisc.c4
-rw-r--r--src/xkb/XKBNames.c2
-rw-r--r--src/xkb/XKBRdBuf.c2
-rw-r--r--src/xkb/XKBSetGeom.c2
-rw-r--r--src/xkb/XKBSetMap.c2
-rw-r--r--src/xkb/XKBUse.c2
-rw-r--r--src/xkb/XKBleds.c2
-rw-r--r--src/xlibi18n/ICWrap.c1
-rw-r--r--src/xlibi18n/XDefaultIMIF.c1
109 files changed, 0 insertions, 150 deletions
diff --git a/include/X11/Xlibint.h b/include/X11/Xlibint.h
index 0e97fd9c..e765cc91 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 9dad0887..ee304c83 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 aa623eca..5d1fd025 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 93631b65..f818faaf 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 bae5e7ff..497c8659 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 199368cb..946d7807 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 93a85522..68d56d57 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 cef4dbff..ae26fa82 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 e3a4d10e..26930c42 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 9bb35379..f5cc66e4 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 a80100a7..5462f37b 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 0c188aab..ddd9c22e 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 7d422a6f..b2e24538 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 5c1dd2b9..876a850e 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 71f72461..78928e07 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 bb1dbe74..8ca1c804 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 e2fd6bf4..92b3f5d9 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 683c8f1c..9fb7db06 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 77e70f34..4aca053a 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 2611a7f7..0a48e548 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 b664b8dd..6a4c1e21 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 d1e9f023..a3ab65be 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 c073592c..3018cf2c 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 169486b0..9823c690 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 1fa79601..cd0eb9f6 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 484d1627..7d497c92 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 9f55c210..1e1249d8 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 6bdd4fae..081a2248 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 815f21ba..5d43ead4 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 602ba658..e8f1b030 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 4ac69d16..17f487fb 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 05e2f04d..3db176fe 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 474a6915..2c35d210 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 5f65ffe6..0fcdb669 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 75d772bd..a80c19c5 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 2c93f2bd..2258f8ce 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 f63b4fec..1aba3bb7 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 b0af60b7..c10824cf 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 f5d37a1d..07dc8411 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 08d0f287..a0d98277 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 3831102a..3a969d74 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 e22ee5dd..ead93dca 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 bbdc8377..c12f2685 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 3338ec78..b0b60710 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 5763ed7c..7a562584 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 2bf2cb29..6d80a021 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 ae9fa16c..ec8e5f8f 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 d2cb221d..e9816191 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 344f990d..72560aba 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 5a41ec35..16b522e8 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 04c700e4..f7f969f5 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 ec1672b2..cbc8ca12 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 28c2da5a..c99bfdd5 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 28657917..69b979ba 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 7d5d7035..8de95569 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 5f9b09f2..e997b1b8 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 3a7aebe2..06546f0e 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 3421dd52..207cd119 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 521df407..f9d4c29b 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 56b510d6..97b1f116 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 7aca7d7b..4638095c 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 0df6f028..e51375fa 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 266e9bec..bb17c42f 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 ca94f048..4e230e77 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 a7446a2f..4b8431d5 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 d2968dc8..e1379a6f 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 5a8d310e..9f612fcb 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 67facd1e..e458bc52 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 c94c11a8..8a17dbb2 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 55360e7d..f713f424 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 c40d0811..3cea282f 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 3f68c34f..1776f2e1 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 27e75caa..cc8bd5ac 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 94ed0c30..2e292019 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 014cb1cf..6326de76 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 26d33b7a..77c1f067 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 511cc18c..c88c8da7 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 9e284e49..ac15ddc9 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 b4483ef6..b17135c0 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 4fb93972..11a85bab 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 415ee81f..89e38a74 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 4068b59b..c3c1974d 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 105e8bd9..d39de6cb 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 f93a25b1..00816ce0 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 b4803652..b7c32147 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 776fffd7..15e98742 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 ad86b916..42dba992 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 bd615eaa..05e9f731 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 0054a5c2..cf93ea79 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 49cfffe1..1c16adce 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 ba7f6864..206b0c90 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 3742c94e..2b33b305 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 b2621a9b..da74fc04 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 e8157b95..353e769b 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 8f163c34..17d13be5 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 2742313e..e9e36d0c 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 15d0338a..8e4f5545 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 c0d3c172..30fb6297 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 f202d935..e1b41278 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 3ed9c7bf..a6b39216 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 587d8f9a..fc5ae5f6 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 b07f73ca..cf2382cc 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 6d1f6724..3023a32e 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 aa6046c5..ab76a206 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 bd46e1fc..cad9364b 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 562e0f03..05dcfc18 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 24a42c33..d9b743c6 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 018f89a6..1eacfa5f 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 de17d20c..d36962f0 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"