Remove #define NEED_EVENTS and NEED_REPLIES

A grep on xorg/* revealed there's no consumer of this define. Quote Alan Coopersmith: "The consumer was in past versions of the headers now located in proto/x11proto - for instance, in X11R6.0's xc/include/Xproto.h, all the event definitions were only available if NEED_EVENTS were defined, and all the reply definitions required NEED_REPLIES. Looks like Xproto.h dropped them by X11R6.3, which didn't have the #ifdef's anymore, so these are truly ancient now." Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2008-11-28 22:28:32 +10:00 · 2008-11-28 22:28:32 +10:00 · cb95642dc8
parent 920b7622be
commit cb95642dc8
182 changed files with 0 additions and 265 deletions
--- a/Xext/bigreq.c
+++ b/Xext/bigreq.c
@ -26,7 +26,6 @@ from The Open Group.

 */

-#define NEED_EVENTS
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xext/geint.h
+++ b/Xext/geint.h
@ -29,7 +29,6 @@
 #ifndef _GEINT_H_
 #define _GEINT_H_

-#define NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include "misc.h"
--- a/Xext/mbuf.c
+++ b/Xext/mbuf.c
@ -24,8 +24,6 @@ in this Software without prior written authorization from The Open Group.

 ********************************************************/

-#define NEED_REPLIES
-#define NEED_EVENTS
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xext/mbufbf.c
+++ b/Xext/mbufbf.c
@ -25,8 +25,6 @@ in this Software without prior written authorization from The Open Group.
 */


-#define NEED_REPLIES
-#define NEED_EVENTS
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xext/mbufpx.c
+++ b/Xext/mbufpx.c
@ -24,8 +24,6 @@ in this Software without prior written authorization from The Open Group.

 ********************************************************/

-#define NEED_REPLIES
-#define NEED_EVENTS
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@ -31,7 +31,6 @@ Equipment Corporation.
 #include <dmx-config.h>
 #endif

-#define NEED_REPLIES
 #include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
--- a/Xext/panoramiXprocs.c
+++ b/Xext/panoramiXprocs.c
@ -32,8 +32,6 @@ Equipment Corporation.

 #include <stdio.h>
 #include <X11/X.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
 #include <X11/Xproto.h>
 #include "windowstr.h"
 #include "dixfontstr.h"
--- a/Xext/saver.c
+++ b/Xext/saver.c
@ -27,8 +27,6 @@ in this Software without prior written authorization from the X Consortium.
 */


-#define NEED_REPLIES
-#define NEED_EVENTS
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xext/shape.c
+++ b/Xext/shape.c
@ -24,8 +24,6 @@ in this Software without prior written authorization from The Open Group.

 ********************************************************/

-#define NEED_REPLIES
-#define NEED_EVENTS
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xext/shm.c
+++ b/Xext/shm.c
@ -38,8 +38,6 @@ in this Software without prior written authorization from The Open Group.
 #include <sys/shm.h>
 #include <unistd.h>
 #include <sys/stat.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include "misc.h"
--- a/Xext/sync.c
+++ b/Xext/sync.c
@ -50,8 +50,6 @@ PERFORMANCE OF THIS SOFTWARE.

 */

-#define NEED_REPLIES
-#define NEED_EVENTS
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xext/xcalibrate.c
+++ b/Xext/xcalibrate.c
@ -24,8 +24,6 @@
 #include <kdrive-config.h>
 #endif

-#define NEED_EVENTS
-#define NEED_REPLIES

 #include <X11/X.h>
 #include <X11/Xproto.h>
--- a/Xext/xcmisc.c
+++ b/Xext/xcmisc.c
@ -26,8 +26,6 @@ from The Open Group.

 */

-#define NEED_EVENTS
-#define NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xext/xres.c
+++ b/Xext/xres.c
@ -2,8 +2,6 @@
   Copyright (c) 2002  XFree86 Inc
 */

-#define NEED_EVENTS
-#define NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@ -31,7 +31,6 @@
 #endif

 #include <X11/X.h>
-#define NEED_EVENTS
 #include <X11/Xproto.h>
 #include "misc.h"
 #include "os.h"
--- a/Xext/xvmc.c
+++ b/Xext/xvmc.c
@ -1,6 +1,4 @@

-#define NEED_REPLIES
-#define NEED_EVENTS
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/allowev.c
+++ b/Xi/allowev.c
@ -50,8 +50,6 @@ SOFTWARE.
 *
 */

-#define	 NEED_EVENTS
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/chdevcur.c
+++ b/Xi/chdevcur.c
@ -29,8 +29,6 @@
 *
 */

-#define	 NEED_EVENTS
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/chdevhier.c
+++ b/Xi/chdevhier.c
@ -30,8 +30,6 @@
 */


-#define	 NEED_EVENTS
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/chgdctl.c
+++ b/Xi/chgdctl.c
@ -50,8 +50,6 @@ SOFTWARE.
 *
 */

-#define	 NEED_EVENTS	/* for inputstr.h    */
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/chgfctl.c
+++ b/Xi/chgfctl.c
@ -50,8 +50,6 @@ SOFTWARE.
 *
 */

-#define	 NEED_EVENTS	/* for inputstr.h    */
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/chgkbd.c
+++ b/Xi/chgkbd.c
@ -50,8 +50,6 @@ SOFTWARE.
 *
 */

-#define	 NEED_EVENTS
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/chgkmap.c
+++ b/Xi/chgkmap.c
@ -50,8 +50,6 @@ SOFTWARE.
 *
 */

-#define	 NEED_EVENTS	/* for inputstr.h    */
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/chgprop.c
+++ b/Xi/chgprop.c
@ -50,8 +50,6 @@ SOFTWARE.
 *
 */

-#define	 NEED_EVENTS
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/chgptr.c
+++ b/Xi/chgptr.c
@ -50,8 +50,6 @@ SOFTWARE.
 *
 */

-#define	 NEED_EVENTS
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/closedev.c
+++ b/Xi/closedev.c
@ -50,8 +50,6 @@ SOFTWARE.
 *
 */

-#define	 NEED_EVENTS
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/devbell.c
+++ b/Xi/devbell.c
@ -50,8 +50,6 @@ SOFTWARE.
 *
 */

-#define	 NEED_EVENTS
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@ -52,7 +52,6 @@ SOFTWARE.
 *
 */

-#define	 NEED_EVENTS
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/extgrbdev.c
+++ b/Xi/extgrbdev.c
@ -29,8 +29,6 @@
 *
 */

-#define	 NEED_EVENTS
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@ -52,8 +52,6 @@ SOFTWARE.

 #define	 NUMTYPES 15

-#define	 NEED_EVENTS
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/getbmap.c
+++ b/Xi/getbmap.c
@ -50,8 +50,6 @@ SOFTWARE.
 *
 */

-#define	 NEED_EVENTS
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/getcptr.c
+++ b/Xi/getcptr.c
@ -23,8 +23,6 @@
 * Author: Peter Hutterer, University of South Australia, NICTA
 */

-#define	 NEED_EVENTS
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/getdctl.c
+++ b/Xi/getdctl.c
@ -50,8 +50,6 @@ SOFTWARE.
 *
 */

-#define	 NEED_EVENTS	/* for inputstr.h    */
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/getfctl.c
+++ b/Xi/getfctl.c
@ -50,8 +50,6 @@ SOFTWARE.
 *
 */

-#define	 NEED_EVENTS	/* for inputstr.h    */
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/getfocus.c
+++ b/Xi/getfocus.c
@ -50,8 +50,6 @@ SOFTWARE.
 *
 */

-#define	 NEED_EVENTS
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/getkmap.c
+++ b/Xi/getkmap.c
@ -50,8 +50,6 @@ SOFTWARE.
 *
 */

-#define	 NEED_EVENTS	/* for inputstr.h    */
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/getmmap.c
+++ b/Xi/getmmap.c
@ -50,8 +50,6 @@ SOFTWARE.
 *
 */

-#define	 NEED_EVENTS	/* for inputstr.h    */
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/getprop.c
+++ b/Xi/getprop.c
@ -50,8 +50,6 @@ SOFTWARE.
 *
 */

-#define	 NEED_EVENTS
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/getselev.c
+++ b/Xi/getselev.c
@ -50,8 +50,6 @@ SOFTWARE.
 *
 */

-#define	 NEED_EVENTS
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/getvers.c
+++ b/Xi/getvers.c
@ -50,8 +50,6 @@ SOFTWARE.
 *
 */

-#define	 NEED_EVENTS
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/grabdev.c
+++ b/Xi/grabdev.c
@ -50,8 +50,6 @@ SOFTWARE.
 *
 */

-#define	 NEED_EVENTS
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/grabdevb.c
+++ b/Xi/grabdevb.c
@ -50,8 +50,6 @@ SOFTWARE.
 *
 */

-#define	 NEED_EVENTS
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/grabdevk.c
+++ b/Xi/grabdevk.c
@ -50,8 +50,6 @@ SOFTWARE.
 *
 */

-#define	 NEED_EVENTS
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/gtmotion.c
+++ b/Xi/gtmotion.c
@ -50,8 +50,6 @@ SOFTWARE.
 *
 */

-#define	 NEED_EVENTS
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/listdev.c
+++ b/Xi/listdev.c
@ -50,8 +50,6 @@ SOFTWARE.
 *
 */

-#define	 NEED_EVENTS
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/opendev.c
+++ b/Xi/opendev.c
@ -50,8 +50,6 @@ SOFTWARE.
 *
 */

-#define	 NEED_EVENTS
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/querydp.c
+++ b/Xi/querydp.c
@ -29,8 +29,6 @@
 *
 */

-#define	 NEED_EVENTS
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/queryst.c
+++ b/Xi/queryst.c
@ -32,8 +32,6 @@ from The Open Group.
 *
 */

-#define	 NEED_EVENTS
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/selectev.c
+++ b/Xi/selectev.c
@ -50,8 +50,6 @@ SOFTWARE.
 *
 */

-#define	 NEED_EVENTS
-#define	 NEED_REPLIES

 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
--- a/Xi/sendexev.c
+++ b/Xi/sendexev.c
@ -50,8 +50,6 @@ SOFTWARE.
 *
 */

-#define	 NEED_EVENTS
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/setbmap.c
+++ b/Xi/setbmap.c
@ -50,8 +50,6 @@ SOFTWARE.
 *
 */

-#define	 NEED_EVENTS
-#define	 NEED_REPLIES
 #define IsOn(ptr, bit) \
 	(((BYTE *) (ptr))[(bit)>>3] & (1 << ((bit) & 7)))

--- a/Xi/setcptr.c
+++ b/Xi/setcptr.c
@ -31,8 +31,6 @@
 */


-#define	 NEED_EVENTS
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/setdval.c
+++ b/Xi/setdval.c
@ -50,8 +50,6 @@ SOFTWARE.
 *
 */

-#define	 NEED_EVENTS
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/setfocus.c
+++ b/Xi/setfocus.c
@ -50,8 +50,6 @@ SOFTWARE.
 *
 */

-#define	 NEED_EVENTS
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/setmmap.c
+++ b/Xi/setmmap.c
@ -50,8 +50,6 @@ SOFTWARE.
 *
 */

-#define	 NEED_EVENTS	/* for inputstr.h    */
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/setmode.c
+++ b/Xi/setmode.c
@ -50,8 +50,6 @@ SOFTWARE.
 *
 */

-#define	 NEED_EVENTS
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/stubs.c
+++ b/Xi/stubs.c
@ -54,7 +54,6 @@ SOFTWARE.
 * Xnest could do the same thing.
 */

-#define	 NEED_EVENTS
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/ungrdev.c
+++ b/Xi/ungrdev.c
@ -50,8 +50,6 @@ SOFTWARE.
 *
 */

-#define	 NEED_EVENTS
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/ungrdevb.c
+++ b/Xi/ungrdevb.c
@ -50,8 +50,6 @@ SOFTWARE.
 *
 */

-#define	 NEED_EVENTS
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/ungrdevk.c
+++ b/Xi/ungrdevk.c
@ -50,8 +50,6 @@ SOFTWARE.
 *
 */

-#define	 NEED_EVENTS
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/warpdevp.c
+++ b/Xi/warpdevp.c
@ -29,8 +29,6 @@
 *
 */

-#define	 NEED_EVENTS
-#define	 NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/Xi/xiselev.c
+++ b/Xi/xiselev.c
@ -23,8 +23,6 @@
 * Author: Peter Hutterer, University of South Australia, NICTA
 */

-#define	 NEED_EVENTS
-#define	 NEED_REPLIES

 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
--- a/damageext/damageextint.h
+++ b/damageext/damageextint.h
@ -27,7 +27,6 @@
 #ifndef _DAMAGEEXTINT_H_
 #define _DAMAGEEXTINT_H_

-#define NEED_EVENTS
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include "misc.h"
--- a/dbe/dbe.c
+++ b/dbe/dbe.c
@ -33,7 +33,6 @@

 /* INCLUDES */

-#define NEED_EVENTS
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/dbe/midbe.c
+++ b/dbe/midbe.c
@ -33,8 +33,6 @@

 /* INCLUDES */

-#define NEED_REPLIES
-#define NEED_EVENTS
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/dix/colormap.c
+++ b/dix/colormap.c
@ -51,7 +51,6 @@ SOFTWARE.
 #endif

 #include <X11/X.h>
-#define NEED_EVENTS
 #include <X11/Xproto.h>
 #include <stdio.h>
 #include <string.h>
--- a/dix/devices.c
+++ b/dix/devices.c
@ -54,8 +54,6 @@ SOFTWARE.
 #include <X11/X.h>
 #include "misc.h"
 #include "resource.h"
-#define NEED_EVENTS
-#define NEED_REPLIES
 #include <X11/Xproto.h>
 #include <X11/Xatom.h>
 #include "windowstr.h"
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@ -48,7 +48,6 @@ Equipment Corporation.

 ******************************************************************/

-#define NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/dix/events.c
+++ b/dix/events.c
@ -120,8 +120,6 @@ of the copyright holder.
 #include <X11/keysym.h>
 #include "misc.h"
 #include "resource.h"
-#define NEED_EVENTS
-#define NEED_REPLIES
 #include <X11/Xproto.h>
 #include "windowstr.h"
 #include "inputstr.h"
--- a/dix/extension.c
+++ b/dix/extension.c
@ -50,8 +50,6 @@ SOFTWARE.
 #endif

 #include <X11/X.h>
-#define NEED_EVENTS
-#define NEED_REPLIES
 #include <X11/Xproto.h>
 #include "misc.h"
 #include "dixstruct.h"
--- a/dix/getevents.c
+++ b/dix/getevents.c
@ -30,8 +30,6 @@

 #include <X11/X.h>
 #include <X11/keysym.h>
-#define NEED_EVENTS
-#define NEED_REPLIES
 #include <X11/Xproto.h>

 #include "misc.h"
--- a/dix/grabs.c
+++ b/dix/grabs.c
@ -52,7 +52,6 @@ SOFTWARE.

 #include <X11/X.h>
 #include "misc.h"
-#define NEED_EVENTS
 #include <X11/Xproto.h>
 #include "windowstr.h"
 #include "inputstr.h"
--- a/dix/main.c
+++ b/dix/main.c
@ -74,7 +74,6 @@ Equipment Corporation.

 ******************************************************************/

-#define NEED_EVENTS
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/dix/property.c
+++ b/dix/property.c
@ -50,8 +50,6 @@ SOFTWARE.
 #endif

 #include <X11/X.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
 #include <X11/Xproto.h>
 #include "windowstr.h"
 #include "propertyst.h"
--- a/dix/resource.c
+++ b/dix/resource.c
@ -124,7 +124,6 @@ Equipment Corporation.
 *      resource "owned" by the client.
 */

-#define NEED_EVENTS
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/dix/swaprep.c
+++ b/dix/swaprep.c
@ -51,8 +51,6 @@ SOFTWARE.
 #endif

 #include <X11/X.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
 #include <X11/Xproto.h>
 #include "misc.h"
 #include "dixstruct.h"
--- a/dix/swapreq.c
+++ b/dix/swapreq.c
@ -51,7 +51,6 @@ SOFTWARE.
 #endif

 #include <X11/X.h>
-#define NEED_EVENTS
 #include <X11/Xproto.h>
 #include <X11/Xprotostr.h>
 #include "misc.h"
--- a/dix/tables.c
+++ b/dix/tables.c
@ -50,8 +50,6 @@ SOFTWARE.
 #endif

 #include <X11/X.h>
-#define NEED_EVENTS
-#define NEED_REPLIES
 #include <X11/Xproto.h>
 #include "windowstr.h"
 #include "extnsionst.h"
--- a/exa/exa_priv.h
+++ b/exa/exa_priv.h
@ -33,7 +33,6 @@
 #include "exa.h"

 #include <X11/X.h>
-#define NEED_EVENTS
 #include <X11/Xproto.h>
 #ifdef MITSHM
 #include "shmint.h"
--- a/glx/glxcmds.c
+++ b/glx/glxcmds.c
@ -28,7 +28,6 @@
 * Silicon Graphics, Inc.
 */

-#define NEED_REPLIES
 #define FONT_PCF
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
--- a/glx/glxcmdsswap.c
+++ b/glx/glxcmdsswap.c
@ -28,7 +28,6 @@
 * Silicon Graphics, Inc.
 */

-#define NEED_REPLIES
 #define FONT_PCF
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
--- a/glx/glxext.c
+++ b/glx/glxext.c
@ -28,7 +28,6 @@
 * Silicon Graphics, Inc.
 */

-#define NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/glx/glxutil.c
+++ b/glx/glxutil.c
@ -28,7 +28,6 @@
 * Silicon Graphics, Inc.
 */

-#define NEED_REPLIES
 #define FONT_PCF
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
--- a/glx/indirect_program.c
+++ b/glx/indirect_program.c
@ -29,7 +29,6 @@
 * \author Ian Romanick <idr@us.ibm.com>
 */

-#define NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/glx/indirect_texture_compression.c
+++ b/glx/indirect_texture_compression.c
@ -23,7 +23,6 @@
 * SOFTWARE.
 */

-#define NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/glx/render2.c
+++ b/glx/render2.c
@ -28,7 +28,6 @@
 * Silicon Graphics, Inc.
 */

-/* #define NEED_REPLIES */
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/glx/render2swap.c
+++ b/glx/render2swap.c
@ -28,7 +28,6 @@
 * Silicon Graphics, Inc.
 */

-/* #define NEED_REPLIES */
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/glx/renderpix.c
+++ b/glx/renderpix.c
@ -28,7 +28,6 @@
 * Silicon Graphics, Inc.
 */

-#define NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/glx/renderpixswap.c
+++ b/glx/renderpixswap.c
@ -28,7 +28,6 @@
 * Silicon Graphics, Inc.
 */

-#define NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/glx/single2.c
+++ b/glx/single2.c
@ -28,7 +28,6 @@
 * Silicon Graphics, Inc.
 */

-#define NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/glx/single2swap.c
+++ b/glx/single2swap.c
@ -28,7 +28,6 @@
 * Silicon Graphics, Inc.
 */

-#define NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/glx/singlepix.c
+++ b/glx/singlepix.c
@ -28,7 +28,6 @@
 * Silicon Graphics, Inc.
 */

-#define NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/glx/singlepixswap.c
+++ b/glx/singlepixswap.c
@ -28,7 +28,6 @@
 * Silicon Graphics, Inc.
 */

-#define NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/glx/swap_interval.c
+++ b/glx/swap_interval.c
@ -22,7 +22,6 @@
 * USE OR OTHER DEALINGS IN THE SOFTWARE.
 */

-#define NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/glx/xfont.c
+++ b/glx/xfont.c
@ -28,7 +28,6 @@
 * Silicon Graphics, Inc.
 */

-#define NEED_REPLIES
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
--- a/hw/dmx/glxProxy/g_renderswap.c
+++ b/hw/dmx/glxProxy/g_renderswap.c
@ -28,7 +28,6 @@
 * Silicon Graphics, Inc.
 */

-#define NEED_REPLIES
 #include "glxserver.h"
 #include "glxext.h"
 #include "g_disptab.h"
--- a/hw/dmx/glxProxy/global.c
+++ b/hw/dmx/glxProxy/global.c
@ -28,7 +28,6 @@
 * Silicon Graphics, Inc.
 */

-#define NEED_REPLIES
 #include "glxserver.h"

 /*
--- a/hw/dmx/glxProxy/glxcmds.c
+++ b/hw/dmx/glxProxy/glxcmds.c
@ -43,7 +43,6 @@
 #undef Xrealloc
 #undef Xfree

-#define NEED_REPLIES
 #define FONT_PCF
 #include "glxserver.h"
 #include <GL/glxtokens.h>
--- a/hw/dmx/glxProxy/glxcmdsswap.c
+++ b/hw/dmx/glxProxy/glxcmdsswap.c
@ -28,7 +28,6 @@
 * Silicon Graphics, Inc.
 */

-#define NEED_REPLIES
 #define FONT_PCF
 #include "glxserver.h"
 #include "glxutil.h"
--- a/hw/dmx/glxProxy/glxext.c
+++ b/hw/dmx/glxProxy/glxext.c
@ -34,7 +34,6 @@

 #include "dmx.h"

-#define NEED_REPLIES
 #include "glxserver.h"
 #include <windowstr.h>
 #include <propertyst.h>
--- a/Show More
+++ b/Show More