diff --git a/Xext/bigreq.c b/Xext/bigreq.c index 0dc60c2584..13114e326f 100644 --- a/Xext/bigreq.c +++ b/Xext/bigreq.c @@ -26,9 +26,7 @@ from The Open Group. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xext/dpms.c b/Xext/dpms.c index 8ac73d8199..b0dca98e13 100644 --- a/Xext/dpms.c +++ b/Xext/dpms.c @@ -26,9 +26,7 @@ Equipment Corporation. ******************************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xext/geext.c b/Xext/geext.c index ac21b7a53c..68d9004081 100644 --- a/Xext/geext.c +++ b/Xext/geext.c @@ -23,9 +23,7 @@ * Author: Peter Hutterer, University of South Australia, NICTA */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "windowstr.h" #include diff --git a/Xext/hashtable.c b/Xext/hashtable.c index 3434c99487..13db19f9d8 100644 --- a/Xext/hashtable.c +++ b/Xext/hashtable.c @@ -1,6 +1,4 @@ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include "misc.h" diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c index 732e983ba3..f43ae2a956 100644 --- a/Xext/panoramiX.c +++ b/Xext/panoramiX.c @@ -23,9 +23,7 @@ dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xext/panoramiXSwap.c b/Xext/panoramiXSwap.c index 022defdc78..4257696a15 100644 --- a/Xext/panoramiXSwap.c +++ b/Xext/panoramiXSwap.c @@ -23,9 +23,7 @@ dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c index 3e3567590f..e8252decfe 100644 --- a/Xext/panoramiXprocs.c +++ b/Xext/panoramiXprocs.c @@ -25,9 +25,7 @@ Equipment Corporation. /* Massively rewritten by Mark Vojkovich */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xext/saver.c b/Xext/saver.c index f76ff8e103..705c6b7a92 100644 --- a/Xext/saver.c +++ b/Xext/saver.c @@ -26,9 +26,7 @@ in this Software without prior written authorization from the X Consortium. * Author: Keith Packard, MIT X Consortium */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xext/security.c b/Xext/security.c index 426dc86014..8eb29e1502 100644 --- a/Xext/security.c +++ b/Xext/security.c @@ -24,9 +24,7 @@ in this Software without prior written authorization from The Open Group. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xext/shape.c b/Xext/shape.c index 213e7cc3f8..12f4c7f787 100644 --- a/Xext/shape.c +++ b/Xext/shape.c @@ -24,9 +24,7 @@ in this Software without prior written authorization from The Open Group. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xext/shm.c b/Xext/shm.c index 091a95b502..5d07f30f16 100644 --- a/Xext/shm.c +++ b/Xext/shm.c @@ -28,9 +28,7 @@ in this Software without prior written authorization from The Open Group. #define SHM -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xext/sleepuntil.c b/Xext/sleepuntil.c index 3ff7a1d04c..0fbfab10a1 100644 --- a/Xext/sleepuntil.c +++ b/Xext/sleepuntil.c @@ -27,9 +27,7 @@ in this Software without prior written authorization from The Open Group. /* dixsleep.c - implement millisecond timeouts for X clients */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "sleepuntil.h" #include diff --git a/Xext/sync.c b/Xext/sync.c index c71d919c14..2172b72cba 100644 --- a/Xext/sync.c +++ b/Xext/sync.c @@ -49,9 +49,7 @@ PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xext/vidmode.c b/Xext/vidmode.c index c7c61647e4..1bc98a8af7 100644 --- a/Xext/vidmode.c +++ b/Xext/vidmode.c @@ -29,9 +29,7 @@ from Kaleb S. KEITHLEY */ /* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #ifdef XF86VIDMODE diff --git a/Xext/xace.c b/Xext/xace.c index bb8ce69977..5051b832ce 100644 --- a/Xext/xace.c +++ b/Xext/xace.c @@ -17,9 +17,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include "scrnintstr.h" diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c index 385e633836..b70e54ed4e 100644 --- a/Xext/xcmisc.c +++ b/Xext/xcmisc.c @@ -26,9 +26,7 @@ from The Open Group. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c index ef0113793e..4058740d16 100644 --- a/Xext/xf86bigfont.c +++ b/Xext/xf86bigfont.c @@ -34,9 +34,7 @@ * XLoadQueryFont). */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #ifdef MITSHM diff --git a/Xext/xres.c b/Xext/xres.c index 9d71402f13..818a45c020 100644 --- a/Xext/xres.c +++ b/Xext/xres.c @@ -2,9 +2,7 @@ Copyright (c) 2002 XFree86 Inc */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xext/xselinux_ext.c b/Xext/xselinux_ext.c index 534d50b717..506eb5d0fd 100644 --- a/Xext/xselinux_ext.c +++ b/Xext/xselinux_ext.c @@ -17,9 +17,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "dix/dix_priv.h" #include "dix/property_priv.h" diff --git a/Xext/xselinux_hooks.c b/Xext/xselinux_hooks.c index 65cb602172..13d0dfe2a6 100644 --- a/Xext/xselinux_hooks.c +++ b/Xext/xselinux_hooks.c @@ -22,9 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * All rights reserved. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xext/xselinux_label.c b/Xext/xselinux_label.c index 08159ff0b8..4110f9074f 100644 --- a/Xext/xselinux_label.c +++ b/Xext/xselinux_label.c @@ -17,9 +17,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/Xext/xtest.c b/Xext/xtest.c index ddd02f6109..cfb70bafe1 100644 --- a/Xext/xtest.c +++ b/Xext/xtest.c @@ -26,9 +26,7 @@ */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c index 64a5a1bf64..bd58388e59 100644 --- a/Xext/xvdisp.c +++ b/Xext/xvdisp.c @@ -21,9 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/Xext/xvmain.c b/Xext/xvmain.c index 34b6f1df5d..190360529d 100644 --- a/Xext/xvmain.c +++ b/Xext/xvmain.c @@ -73,9 +73,7 @@ SOFTWARE. ** */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xext/xvmc.c b/Xext/xvmc.c index 22856af56a..435a1be127 100644 --- a/Xext/xvmc.c +++ b/Xext/xvmc.c @@ -1,7 +1,5 @@ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xi/allowev.c b/Xi/allowev.c index fc4f33be83..0db7925a3b 100644 --- a/Xi/allowev.c +++ b/Xi/allowev.c @@ -50,9 +50,7 @@ SOFTWARE. * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "inputstr.h" /* DeviceIntPtr */ #include diff --git a/Xi/chgdctl.c b/Xi/chgdctl.c index 4dd4799ad1..188d92fc5a 100644 --- a/Xi/chgdctl.c +++ b/Xi/chgdctl.c @@ -50,9 +50,7 @@ SOFTWARE. * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include /* control constants */ diff --git a/Xi/chgfctl.c b/Xi/chgfctl.c index 7a597e43db..19213f4212 100644 --- a/Xi/chgfctl.c +++ b/Xi/chgfctl.c @@ -50,9 +50,7 @@ SOFTWARE. * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "inputstr.h" /* DeviceIntPtr */ #include diff --git a/Xi/chgkbd.c b/Xi/chgkbd.c index 4f5abd7313..098c41fa9c 100644 --- a/Xi/chgkbd.c +++ b/Xi/chgkbd.c @@ -50,9 +50,7 @@ SOFTWARE. * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "inputstr.h" /* DeviceIntPtr */ #include diff --git a/Xi/chgkmap.c b/Xi/chgkmap.c index 2940a2cb0e..282d327d12 100644 --- a/Xi/chgkmap.c +++ b/Xi/chgkmap.c @@ -50,9 +50,7 @@ SOFTWARE. * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xi/chgprop.c b/Xi/chgprop.c index a97fab18df..78b4d21639 100644 --- a/Xi/chgprop.c +++ b/Xi/chgprop.c @@ -50,9 +50,7 @@ SOFTWARE. * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xi/chgptr.c b/Xi/chgptr.c index 06047a62a5..e909390922 100644 --- a/Xi/chgptr.c +++ b/Xi/chgptr.c @@ -50,9 +50,7 @@ SOFTWARE. * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "inputstr.h" /* DeviceIntPtr */ #include diff --git a/Xi/closedev.c b/Xi/closedev.c index af60d7e99d..c0fb424ab1 100644 --- a/Xi/closedev.c +++ b/Xi/closedev.c @@ -50,9 +50,7 @@ SOFTWARE. * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ diff --git a/Xi/devbell.c b/Xi/devbell.c index 2e2a348f97..51facd9b66 100644 --- a/Xi/devbell.c +++ b/Xi/devbell.c @@ -50,9 +50,7 @@ SOFTWARE. * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "inputstr.h" /* DeviceIntPtr */ #include diff --git a/Xi/exevents.c b/Xi/exevents.c index 2f02d7ed42..5c866e2ec4 100644 --- a/Xi/exevents.c +++ b/Xi/exevents.c @@ -78,9 +78,7 @@ SOFTWARE. * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "dix/cursor_priv.h" diff --git a/Xi/extinit.c b/Xi/extinit.c index 6354ad0594..223722ad2b 100644 --- a/Xi/extinit.c +++ b/Xi/extinit.c @@ -51,9 +51,7 @@ SOFTWARE. */ #define NUMTYPES 15 -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xi/getbmap.c b/Xi/getbmap.c index ce3e9e60b1..01ade01c46 100644 --- a/Xi/getbmap.c +++ b/Xi/getbmap.c @@ -50,9 +50,7 @@ SOFTWARE. * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "inputstr.h" /* DeviceIntPtr */ #include diff --git a/Xi/getdctl.c b/Xi/getdctl.c index 149f5e14e1..98fea52def 100644 --- a/Xi/getdctl.c +++ b/Xi/getdctl.c @@ -50,9 +50,7 @@ SOFTWARE. * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "inputstr.h" /* DeviceIntPtr */ #include diff --git a/Xi/getfctl.c b/Xi/getfctl.c index eea0113c15..88e8169751 100644 --- a/Xi/getfctl.c +++ b/Xi/getfctl.c @@ -50,9 +50,7 @@ SOFTWARE. * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "inputstr.h" /* DeviceIntPtr */ #include diff --git a/Xi/getfocus.c b/Xi/getfocus.c index cf8e02449d..de280ea79e 100644 --- a/Xi/getfocus.c +++ b/Xi/getfocus.c @@ -50,9 +50,7 @@ SOFTWARE. * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "windowstr.h" /* focus struct */ #include "inputstr.h" /* DeviceIntPtr */ diff --git a/Xi/getkmap.c b/Xi/getkmap.c index c6db2cee28..1352ae6c78 100644 --- a/Xi/getkmap.c +++ b/Xi/getkmap.c @@ -50,9 +50,7 @@ SOFTWARE. * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "inputstr.h" /* DeviceIntPtr */ #include diff --git a/Xi/getmmap.c b/Xi/getmmap.c index 19d8eb221b..31f723cdf8 100644 --- a/Xi/getmmap.c +++ b/Xi/getmmap.c @@ -50,9 +50,7 @@ SOFTWARE. * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "inputstr.h" /* DeviceIntPtr */ #include diff --git a/Xi/getprop.c b/Xi/getprop.c index 2828313106..205b4ec5c5 100644 --- a/Xi/getprop.c +++ b/Xi/getprop.c @@ -50,9 +50,7 @@ SOFTWARE. * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xi/getselev.c b/Xi/getselev.c index b85eca3ff5..2e1eb906ab 100644 --- a/Xi/getselev.c +++ b/Xi/getselev.c @@ -50,9 +50,7 @@ SOFTWARE. * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xi/getvers.c b/Xi/getvers.c index a56ff16848..98fc2a1998 100644 --- a/Xi/getvers.c +++ b/Xi/getvers.c @@ -50,9 +50,7 @@ SOFTWARE. * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "inputstr.h" /* DeviceIntPtr */ #include diff --git a/Xi/grabdev.c b/Xi/grabdev.c index d26bea434f..db6a72335b 100644 --- a/Xi/grabdev.c +++ b/Xi/grabdev.c @@ -50,9 +50,7 @@ SOFTWARE. * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xi/grabdevb.c b/Xi/grabdevb.c index 344dc54a8e..124ce4fbec 100644 --- a/Xi/grabdevb.c +++ b/Xi/grabdevb.c @@ -50,9 +50,7 @@ SOFTWARE. * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xi/grabdevk.c b/Xi/grabdevk.c index a230f7c3d4..26dd30fbc9 100644 --- a/Xi/grabdevk.c +++ b/Xi/grabdevk.c @@ -50,9 +50,7 @@ SOFTWARE. * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xi/gtmotion.c b/Xi/gtmotion.c index 57a25bb2ea..557dd888ce 100644 --- a/Xi/gtmotion.c +++ b/Xi/gtmotion.c @@ -50,9 +50,7 @@ SOFTWARE. * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xi/listdev.c b/Xi/listdev.c index acd73af287..37961b6c18 100644 --- a/Xi/listdev.c +++ b/Xi/listdev.c @@ -50,9 +50,7 @@ SOFTWARE. * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include /* for inputstr.h */ #include /* Request macro */ diff --git a/Xi/opendev.c b/Xi/opendev.c index 3472c97dde..8d2e117e8b 100644 --- a/Xi/opendev.c +++ b/Xi/opendev.c @@ -50,9 +50,7 @@ SOFTWARE. * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "inputstr.h" /* DeviceIntPtr */ #include diff --git a/Xi/queryst.c b/Xi/queryst.c index d0aad33de1..3bfba94ae4 100644 --- a/Xi/queryst.c +++ b/Xi/queryst.c @@ -32,9 +32,7 @@ from The Open Group. * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xi/selectev.c b/Xi/selectev.c index 378403d3b5..02ab1adcc7 100644 --- a/Xi/selectev.c +++ b/Xi/selectev.c @@ -50,9 +50,7 @@ SOFTWARE. * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xi/sendexev.c b/Xi/sendexev.c index 0f6b4e46a4..9e66bf1d3c 100644 --- a/Xi/sendexev.c +++ b/Xi/sendexev.c @@ -50,9 +50,7 @@ SOFTWARE. * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xi/setbmap.c b/Xi/setbmap.c index cad881b7a6..477d86e92e 100644 --- a/Xi/setbmap.c +++ b/Xi/setbmap.c @@ -50,9 +50,7 @@ SOFTWARE. * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xi/setdval.c b/Xi/setdval.c index 26dedfbf66..175b84cf74 100644 --- a/Xi/setdval.c +++ b/Xi/setdval.c @@ -50,9 +50,7 @@ SOFTWARE. * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xi/setfocus.c b/Xi/setfocus.c index f0c80accc0..de3870201f 100644 --- a/Xi/setfocus.c +++ b/Xi/setfocus.c @@ -50,9 +50,7 @@ SOFTWARE. * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xi/setmmap.c b/Xi/setmmap.c index 5adc7e9d55..0f639cff8f 100644 --- a/Xi/setmmap.c +++ b/Xi/setmmap.c @@ -50,9 +50,7 @@ SOFTWARE. * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xi/setmode.c b/Xi/setmode.c index f67e89e1ab..e218eefb41 100644 --- a/Xi/setmode.c +++ b/Xi/setmode.c @@ -50,9 +50,7 @@ SOFTWARE. * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xi/stubs.c b/Xi/stubs.c index 27848a2f6e..ace15c0062 100644 --- a/Xi/stubs.c +++ b/Xi/stubs.c @@ -54,9 +54,7 @@ SOFTWARE. * Xnest could do the same thing. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xi/ungrdev.c b/Xi/ungrdev.c index fd4fc0f45d..44afc47b11 100644 --- a/Xi/ungrdev.c +++ b/Xi/ungrdev.c @@ -50,9 +50,7 @@ SOFTWARE. * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ diff --git a/Xi/ungrdevb.c b/Xi/ungrdevb.c index 0f5c7913cf..e2a62104fd 100644 --- a/Xi/ungrdevb.c +++ b/Xi/ungrdevb.c @@ -50,9 +50,7 @@ SOFTWARE. * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xi/ungrdevk.c b/Xi/ungrdevk.c index 8aa797b4d5..ff4a11f2d4 100644 --- a/Xi/ungrdevk.c +++ b/Xi/ungrdevk.c @@ -50,9 +50,7 @@ SOFTWARE. * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xi/xiallowev.c b/Xi/xiallowev.c index 23ad4c7ced..63c5ac994a 100644 --- a/Xi/xiallowev.c +++ b/Xi/xiallowev.c @@ -29,9 +29,7 @@ * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xi/xibarriers.c b/Xi/xibarriers.c index 0c6f8877ee..067f71be72 100644 --- a/Xi/xibarriers.c +++ b/Xi/xibarriers.c @@ -41,9 +41,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "dix/cursor_priv.h" #include "dix/dix_priv.h" diff --git a/Xi/xichangecursor.c b/Xi/xichangecursor.c index 3638f9e204..066fe290be 100644 --- a/Xi/xichangecursor.c +++ b/Xi/xichangecursor.c @@ -29,9 +29,7 @@ * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include /* for inputstr.h */ #include /* Request macro */ diff --git a/Xi/xichangehierarchy.c b/Xi/xichangehierarchy.c index 8e7a0dcaef..c89cafbd57 100644 --- a/Xi/xichangehierarchy.c +++ b/Xi/xichangehierarchy.c @@ -30,9 +30,7 @@ * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include /* for inputstr.h */ #include /* Request macro */ diff --git a/Xi/xigetclientpointer.c b/Xi/xigetclientpointer.c index f63d6006e7..597cf38b80 100644 --- a/Xi/xigetclientpointer.c +++ b/Xi/xigetclientpointer.c @@ -23,9 +23,7 @@ * Author: Peter Hutterer, University of South Australia, NICTA */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include /* for inputstr.h */ #include /* Request macro */ diff --git a/Xi/xigrabdev.c b/Xi/xigrabdev.c index 604f8c926d..ca4f66ee45 100644 --- a/Xi/xigrabdev.c +++ b/Xi/xigrabdev.c @@ -29,9 +29,7 @@ * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xi/xipassivegrab.c b/Xi/xipassivegrab.c index 78147d8dd6..7c73501255 100644 --- a/Xi/xipassivegrab.c +++ b/Xi/xipassivegrab.c @@ -29,9 +29,7 @@ * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c index 5ac5d1c1d7..0a23767760 100644 --- a/Xi/xiproperty.c +++ b/Xi/xiproperty.c @@ -25,9 +25,7 @@ /* This code is a modified version of randr/rrproperty.c */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xi/xiquerydevice.c b/Xi/xiquerydevice.c index e286064c26..cbc3c037e4 100644 --- a/Xi/xiquerydevice.c +++ b/Xi/xiquerydevice.c @@ -28,9 +28,7 @@ * @file Protocol handling for the XIQueryDevice request/reply. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xi/xiquerypointer.c b/Xi/xiquerypointer.c index 5948046626..fd362dd541 100644 --- a/Xi/xiquerypointer.c +++ b/Xi/xiquerypointer.c @@ -29,9 +29,7 @@ * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include /* for inputstr.h */ #include /* Request macro */ diff --git a/Xi/xiqueryversion.c b/Xi/xiqueryversion.c index dc3860a21b..8672409f72 100644 --- a/Xi/xiqueryversion.c +++ b/Xi/xiqueryversion.c @@ -29,9 +29,7 @@ * Protocol handling for the XIQueryVersion request/reply. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "inputstr.h" diff --git a/Xi/xiselectev.c b/Xi/xiselectev.c index 6c6aff8843..51de4d7bc7 100644 --- a/Xi/xiselectev.c +++ b/Xi/xiselectev.c @@ -23,9 +23,7 @@ * Author: Peter Hutterer */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/Xi/xisetclientpointer.c b/Xi/xisetclientpointer.c index a865c164c4..85ce3d75ec 100644 --- a/Xi/xisetclientpointer.c +++ b/Xi/xisetclientpointer.c @@ -30,9 +30,7 @@ * default value. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include /* for inputstr.h */ #include /* Request macro */ diff --git a/Xi/xisetdevfocus.c b/Xi/xisetdevfocus.c index d09aa9d5e3..421511ee50 100644 --- a/Xi/xisetdevfocus.c +++ b/Xi/xisetdevfocus.c @@ -28,9 +28,7 @@ * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/Xi/xiwarppointer.c b/Xi/xiwarppointer.c index d5597471c3..daa56619bb 100644 --- a/Xi/xiwarppointer.c +++ b/Xi/xiwarppointer.c @@ -29,9 +29,7 @@ * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include /* for inputstr.h */ #include /* Request macro */ diff --git a/composite/compalloc.c b/composite/compalloc.c index 116b850226..e52c009bdf 100644 --- a/composite/compalloc.c +++ b/composite/compalloc.c @@ -41,9 +41,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "compint.h" diff --git a/composite/compext.c b/composite/compext.c index d0e4e0bfab..25b3e817e4 100644 --- a/composite/compext.c +++ b/composite/compext.c @@ -41,9 +41,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "compint.h" #include "xace.h" diff --git a/composite/compinit.c b/composite/compinit.c index ecb36897da..e645ff6aa5 100644 --- a/composite/compinit.c +++ b/composite/compinit.c @@ -41,9 +41,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "dix/dix_priv.h" diff --git a/composite/compoverlay.c b/composite/compoverlay.c index 18538ed98a..6fd479560c 100644 --- a/composite/compoverlay.c +++ b/composite/compoverlay.c @@ -41,9 +41,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "compint.h" #include "xace.h" diff --git a/composite/compwindow.c b/composite/compwindow.c index 3d62358b90..f675591290 100644 --- a/composite/compwindow.c +++ b/composite/compwindow.c @@ -41,9 +41,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "dix/dix_priv.h" #include "os/osdep.h" diff --git a/config/config.c b/config/config.c index ae67dde275..270631af83 100644 --- a/config/config.c +++ b/config/config.c @@ -23,9 +23,7 @@ * Author: Daniel Stone */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include "os.h" diff --git a/config/dbus-core.c b/config/dbus-core.c index 180ca93644..30495f07b7 100644 --- a/config/dbus-core.c +++ b/config/dbus-core.c @@ -23,9 +23,7 @@ * Author: Daniel Stone */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/config/hal.c b/config/hal.c index 8289956eb4..5210b4aaa9 100644 --- a/config/hal.c +++ b/config/hal.c @@ -24,9 +24,7 @@ * Author: Daniel Stone */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/config/udev.c b/config/udev.c index 836fc2afa1..19f887c7ad 100644 --- a/config/udev.c +++ b/config/udev.c @@ -23,9 +23,7 @@ * Author: Julien Cristau */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/config/wscons.c b/config/wscons.c index a7beb85a46..eb44e1b25f 100644 --- a/config/wscons.c +++ b/config/wscons.c @@ -21,9 +21,7 @@ * DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/damageext/damageext.c b/damageext/damageext.c index 6a46291fd7..7fe4ad513a 100644 --- a/damageext/damageext.c +++ b/damageext/damageext.c @@ -21,9 +21,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "dix/dix_priv.h" diff --git a/dbe/dbe.c b/dbe/dbe.c index 29cac9533e..681d8934ca 100644 --- a/dbe/dbe.c +++ b/dbe/dbe.c @@ -32,9 +32,7 @@ /* INCLUDES */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/dbe/midbe.c b/dbe/midbe.c index c97dac8de9..379b7a0241 100644 --- a/dbe/midbe.c +++ b/dbe/midbe.c @@ -32,9 +32,7 @@ /* INCLUDES */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/exa/exa.c b/exa/exa.c index 8a61a58e30..0422c615f3 100644 --- a/exa/exa.c +++ b/exa/exa.c @@ -28,9 +28,7 @@ * memory management. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/exa/exa_accel.c b/exa/exa_accel.c index 2a31bd3c77..92211964f3 100644 --- a/exa/exa_accel.c +++ b/exa/exa_accel.c @@ -27,9 +27,7 @@ * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "exa_priv.h" #include #include "dixfontstr.h" diff --git a/exa/exa_classic.c b/exa/exa_classic.c index a9460f9996..1b70d350e6 100644 --- a/exa/exa_classic.c +++ b/exa/exa_classic.c @@ -22,9 +22,7 @@ * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/exa/exa_driver.c b/exa/exa_driver.c index 7a74c4500d..4b7a53f7e5 100644 --- a/exa/exa_driver.c +++ b/exa/exa_driver.c @@ -22,9 +22,7 @@ * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/exa/exa_glyphs.c b/exa/exa_glyphs.c index 6b97a83b10..3713018889 100644 --- a/exa/exa_glyphs.c +++ b/exa/exa_glyphs.c @@ -40,9 +40,7 @@ * Based on code by: Keith Packard */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/exa/exa_migration_classic.c b/exa/exa_migration_classic.c index f712e19148..8257895786 100644 --- a/exa/exa_migration_classic.c +++ b/exa/exa_migration_classic.c @@ -26,9 +26,7 @@ * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/exa/exa_migration_mixed.c b/exa/exa_migration_mixed.c index 7d3fca7c0f..52623e3ca9 100644 --- a/exa/exa_migration_mixed.c +++ b/exa/exa_migration_mixed.c @@ -22,9 +22,7 @@ * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/exa/exa_mixed.c b/exa/exa_mixed.c index 4c77146572..f1aeacd489 100644 --- a/exa/exa_mixed.c +++ b/exa/exa_mixed.c @@ -22,9 +22,7 @@ * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/exa/exa_render.c b/exa/exa_render.c index 9fbfdfca2a..da74f64d70 100644 --- a/exa/exa_render.c +++ b/exa/exa_render.c @@ -22,9 +22,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/fb/fballpriv.c b/fb/fballpriv.c index 187d0b0686..e5f9f80acc 100644 --- a/fb/fballpriv.c +++ b/fb/fballpriv.c @@ -20,9 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "fb.h" diff --git a/fb/fbarc.c b/fb/fbarc.c index fe14aed610..98d4281a7a 100644 --- a/fb/fbarc.c +++ b/fb/fbarc.c @@ -20,9 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "fb.h" #include "mizerarc.h" diff --git a/fb/fbbits.c b/fb/fbbits.c index 7435ad56a4..682eff647b 100644 --- a/fb/fbbits.c +++ b/fb/fbbits.c @@ -20,9 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "fb.h" #include "miline.h" diff --git a/fb/fbblt.c b/fb/fbblt.c index c1730ab6a0..b0ac72b824 100644 --- a/fb/fbblt.c +++ b/fb/fbblt.c @@ -20,9 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include "fb.h" diff --git a/fb/fbbltone.c b/fb/fbbltone.c index 7eac85b08c..732a89a9c8 100644 --- a/fb/fbbltone.c +++ b/fb/fbbltone.c @@ -20,9 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "fb.h" diff --git a/fb/fbcmap_mi.c b/fb/fbcmap_mi.c index 6c826dcab1..d9447e0957 100644 --- a/fb/fbcmap_mi.c +++ b/fb/fbcmap_mi.c @@ -27,9 +27,7 @@ * XFree86Server being defined. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/fb/fbcopy.c b/fb/fbcopy.c index 3af128adaa..8a834ac3ee 100644 --- a/fb/fbcopy.c +++ b/fb/fbcopy.c @@ -20,9 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/fb/fbfill.c b/fb/fbfill.c index ad09671fa8..5d08e2257d 100644 --- a/fb/fbfill.c +++ b/fb/fbfill.c @@ -20,9 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "fb.h" diff --git a/fb/fbfillrect.c b/fb/fbfillrect.c index 0075b2cdb0..78feba691f 100644 --- a/fb/fbfillrect.c +++ b/fb/fbfillrect.c @@ -20,9 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "fb.h" diff --git a/fb/fbfillsp.c b/fb/fbfillsp.c index 4debe1ebdd..3fe85b45a5 100644 --- a/fb/fbfillsp.c +++ b/fb/fbfillsp.c @@ -20,9 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "fb.h" diff --git a/fb/fbgc.c b/fb/fbgc.c index 2ab9ecad1f..a269a21209 100644 --- a/fb/fbgc.c +++ b/fb/fbgc.c @@ -20,9 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/fb/fbgetsp.c b/fb/fbgetsp.c index 445a4e3850..2bccb5dd89 100644 --- a/fb/fbgetsp.c +++ b/fb/fbgetsp.c @@ -20,9 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "fb.h" diff --git a/fb/fbglyph.c b/fb/fbglyph.c index 1bdc2d4fd1..5a1282ba93 100644 --- a/fb/fbglyph.c +++ b/fb/fbglyph.c @@ -21,9 +21,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "fb.h" #include diff --git a/fb/fbimage.c b/fb/fbimage.c index bd24728fd9..3e459885dd 100644 --- a/fb/fbimage.c +++ b/fb/fbimage.c @@ -20,9 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/fb/fbline.c b/fb/fbline.c index 38c3c6c164..0a3d454529 100644 --- a/fb/fbline.c +++ b/fb/fbline.c @@ -20,9 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "fb.h" diff --git a/fb/fboverlay.c b/fb/fboverlay.c index d47a7c67ba..5ead17315a 100644 --- a/fb/fboverlay.c +++ b/fb/fboverlay.c @@ -22,9 +22,7 @@ * Author: Keith Packard, SuSE, Inc. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/fb/fbpict.c b/fb/fbpict.c index f985198fbf..76b7aaf004 100644 --- a/fb/fbpict.c +++ b/fb/fbpict.c @@ -23,9 +23,7 @@ * Author: Keith Packard, SuSE, Inc. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/fb/fbpixmap.c b/fb/fbpixmap.c index 89e3370a65..3ed2b56809 100644 --- a/fb/fbpixmap.c +++ b/fb/fbpixmap.c @@ -20,9 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/fb/fbpoint.c b/fb/fbpoint.c index d4c95eea75..0b804e5575 100644 --- a/fb/fbpoint.c +++ b/fb/fbpoint.c @@ -20,9 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "fb.h" diff --git a/fb/fbpush.c b/fb/fbpush.c index 1d1bcfd085..fd96411544 100644 --- a/fb/fbpush.c +++ b/fb/fbpush.c @@ -20,9 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "fb.h" diff --git a/fb/fbscreen.c b/fb/fbscreen.c index 42efaa9113..e825aa92ea 100644 --- a/fb/fbscreen.c +++ b/fb/fbscreen.c @@ -20,9 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "fb.h" diff --git a/fb/fbseg.c b/fb/fbseg.c index 6c3d693633..4992973c0b 100644 --- a/fb/fbseg.c +++ b/fb/fbseg.c @@ -20,9 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/fb/fbsetsp.c b/fb/fbsetsp.c index fe94e283cf..0fdc173801 100644 --- a/fb/fbsetsp.c +++ b/fb/fbsetsp.c @@ -20,9 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "fb.h" diff --git a/fb/fbsolid.c b/fb/fbsolid.c index 1ee165950a..1ad4ab2abf 100644 --- a/fb/fbsolid.c +++ b/fb/fbsolid.c @@ -22,9 +22,7 @@ #define FbSelectPart(xor,o,t) xor -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "fb.h" diff --git a/fb/fbtile.c b/fb/fbtile.c index 785c5f0e48..a7d938667b 100644 --- a/fb/fbtile.c +++ b/fb/fbtile.c @@ -20,9 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "fb.h" diff --git a/fb/fbtrap.c b/fb/fbtrap.c index bf82f8f2c1..0893d168fe 100644 --- a/fb/fbtrap.c +++ b/fb/fbtrap.c @@ -20,9 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "fb.h" diff --git a/fb/fbutil.c b/fb/fbutil.c index c1d5923c49..920d701972 100644 --- a/fb/fbutil.c +++ b/fb/fbutil.c @@ -20,9 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "fb.h" diff --git a/fb/fbwindow.c b/fb/fbwindow.c index df33af9485..96e749a205 100644 --- a/fb/fbwindow.c +++ b/fb/fbwindow.c @@ -20,9 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/glamor/glamor_xv.c b/glamor/glamor_xv.c index 328769ab10..a5b4b68024 100644 --- a/glamor/glamor_xv.c +++ b/glamor/glamor_xv.c @@ -32,9 +32,7 @@ * Xv acceleration implementation */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "glamor_priv.h" #include "glamor_transform.h" diff --git a/glx/clientinfo.c b/glx/clientinfo.c index 74ad91991f..3dcabf844f 100644 --- a/glx/clientinfo.c +++ b/glx/clientinfo.c @@ -20,9 +20,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "glxserver.h" #include "indirect_dispatch.h" diff --git a/glx/createcontext.c b/glx/createcontext.c index 37d14fe999..185bd6bb2d 100644 --- a/glx/createcontext.c +++ b/glx/createcontext.c @@ -20,9 +20,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include "glxserver.h" diff --git a/glx/glxcmds.c b/glx/glxcmds.c index 64dcd6b81d..ab1ed6410c 100644 --- a/glx/glxcmds.c +++ b/glx/glxcmds.c @@ -28,9 +28,7 @@ * Silicon Graphics, Inc. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/glx/glxcmdsswap.c b/glx/glxcmdsswap.c index 7d6674470a..59ce663b79 100644 --- a/glx/glxcmdsswap.c +++ b/glx/glxcmdsswap.c @@ -28,9 +28,7 @@ * Silicon Graphics, Inc. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include "glxserver.h" diff --git a/glx/glxdri2.c b/glx/glxdri2.c index bb557fb7d4..c4e02b7b74 100644 --- a/glx/glxdri2.c +++ b/glx/glxdri2.c @@ -21,9 +21,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/glx/glxdricommon.c b/glx/glxdricommon.c index 35a5396290..0d83fa714d 100644 --- a/glx/glxdricommon.c +++ b/glx/glxdricommon.c @@ -23,9 +23,7 @@ * SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c index c57d80db74..ac657d6f89 100644 --- a/glx/glxdriswrast.c +++ b/glx/glxdriswrast.c @@ -24,9 +24,7 @@ * SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/glx/glxext.c b/glx/glxext.c index 585f64eda7..467fdd542d 100644 --- a/glx/glxext.c +++ b/glx/glxext.c @@ -28,9 +28,7 @@ * Silicon Graphics, Inc. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include "glxserver.h" diff --git a/glx/glxscreens.c b/glx/glxscreens.c index e766e25795..ef969fcd62 100644 --- a/glx/glxscreens.c +++ b/glx/glxscreens.c @@ -28,9 +28,7 @@ * Silicon Graphics, Inc. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/glx/indirect_program.c b/glx/indirect_program.c index c7bfa03ca6..c0c7ae8983 100644 --- a/glx/indirect_program.c +++ b/glx/indirect_program.c @@ -29,9 +29,7 @@ * \author Ian Romanick */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "glxserver.h" #include "glxbyteorder.h" diff --git a/glx/indirect_texture_compression.c b/glx/indirect_texture_compression.c index 6d25bcd04d..c82bc1cb7e 100644 --- a/glx/indirect_texture_compression.c +++ b/glx/indirect_texture_compression.c @@ -23,9 +23,7 @@ * SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "glxserver.h" #include "glxbyteorder.h" diff --git a/glx/indirect_util.c b/glx/indirect_util.c index ba180b0cca..d91ec5d616 100644 --- a/glx/indirect_util.c +++ b/glx/indirect_util.c @@ -23,9 +23,7 @@ * SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/glx/render2.c b/glx/render2.c index 8d9b5f4d29..5d126eeca7 100644 --- a/glx/render2.c +++ b/glx/render2.c @@ -28,9 +28,7 @@ * Silicon Graphics, Inc. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include "unpack.h" diff --git a/glx/render2swap.c b/glx/render2swap.c index 6ed364f75a..243dd0fedc 100644 --- a/glx/render2swap.c +++ b/glx/render2swap.c @@ -28,9 +28,7 @@ * Silicon Graphics, Inc. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "glxserver.h" #include "unpack.h" diff --git a/glx/renderpix.c b/glx/renderpix.c index 91ba911878..958f699c14 100644 --- a/glx/renderpix.c +++ b/glx/renderpix.c @@ -28,9 +28,7 @@ * Silicon Graphics, Inc. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "glxserver.h" #include "unpack.h" diff --git a/glx/renderpixswap.c b/glx/renderpixswap.c index a4cb246bb3..322dc7e860 100644 --- a/glx/renderpixswap.c +++ b/glx/renderpixswap.c @@ -28,9 +28,7 @@ * Silicon Graphics, Inc. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "glxserver.h" #include "unpack.h" diff --git a/glx/rensize.c b/glx/rensize.c index 55ad4a2afd..821c6b3fb3 100644 --- a/glx/rensize.c +++ b/glx/rensize.c @@ -28,9 +28,7 @@ * Silicon Graphics, Inc. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include "glxserver.h" diff --git a/glx/single2.c b/glx/single2.c index 36a01f0cbc..7c9e245492 100644 --- a/glx/single2.c +++ b/glx/single2.c @@ -28,9 +28,7 @@ * Silicon Graphics, Inc. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/glx/single2swap.c b/glx/single2swap.c index b140946ba8..b7c7c00da3 100644 --- a/glx/single2swap.c +++ b/glx/single2swap.c @@ -28,9 +28,7 @@ * Silicon Graphics, Inc. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "glxserver.h" #include "glxutil.h" diff --git a/glx/singlepix.c b/glx/singlepix.c index e1bed19aa7..95dbf51e79 100644 --- a/glx/singlepix.c +++ b/glx/singlepix.c @@ -28,9 +28,7 @@ * Silicon Graphics, Inc. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "glxserver.h" #include "glxext.h" diff --git a/glx/singlepixswap.c b/glx/singlepixswap.c index 8e4d9bddf6..0e27791452 100644 --- a/glx/singlepixswap.c +++ b/glx/singlepixswap.c @@ -28,9 +28,7 @@ * Silicon Graphics, Inc. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "glxserver.h" #include "glxext.h" diff --git a/glx/singlesize.c b/glx/singlesize.c index 4c60b6920c..344ffef7ff 100644 --- a/glx/singlesize.c +++ b/glx/singlesize.c @@ -28,9 +28,7 @@ * Silicon Graphics, Inc. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include "glxserver.h" diff --git a/glx/swap_interval.c b/glx/swap_interval.c index 2320550808..2f1b02cf79 100644 --- a/glx/swap_interval.c +++ b/glx/swap_interval.c @@ -22,9 +22,7 @@ * USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "glxserver.h" #include "glxutil.h" diff --git a/glx/xfont.c b/glx/xfont.c index bd090cb15d..3e84369e8f 100644 --- a/glx/xfont.c +++ b/glx/xfont.c @@ -28,9 +28,7 @@ * Silicon Graphics, Inc. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "dix/dix_priv.h" diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c index 12fbdc0b0c..eee12ac8a7 100644 --- a/hw/kdrive/ephyr/ephyr.c +++ b/hw/kdrive/ephyr/ephyr.c @@ -23,9 +23,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/hw/kdrive/ephyr/ephyr_draw.c b/hw/kdrive/ephyr/ephyr_draw.c index 64e07a7d13..ea9f0cb1a7 100644 --- a/hw/kdrive/ephyr/ephyr_draw.c +++ b/hw/kdrive/ephyr/ephyr_draw.c @@ -25,9 +25,7 @@ * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "ephyr.h" #include "exa_priv.h" diff --git a/hw/kdrive/ephyr/ephyr_glamor_xv.c b/hw/kdrive/ephyr/ephyr_glamor_xv.c index 62e7adaeb6..a93afa17be 100644 --- a/hw/kdrive/ephyr/ephyr_glamor_xv.c +++ b/hw/kdrive/ephyr/ephyr_glamor_xv.c @@ -21,9 +21,7 @@ * IN THE SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "kdrive.h" #include "kxv.h" diff --git a/hw/kdrive/ephyr/ephyrcursor.c b/hw/kdrive/ephyr/ephyrcursor.c index 3f192d034a..9438b2ba37 100644 --- a/hw/kdrive/ephyr/ephyrcursor.c +++ b/hw/kdrive/ephyr/ephyrcursor.c @@ -24,9 +24,7 @@ * Adam Jackson */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "ephyr.h" #include "ephyrlog.h" #include "hostx.h" diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c index 25c078bfb2..9306f33676 100644 --- a/hw/kdrive/ephyr/ephyrinit.c +++ b/hw/kdrive/ephyr/ephyrinit.c @@ -23,9 +23,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "dix/dix_priv.h" #include "os/cmdline.h" diff --git a/hw/kdrive/ephyr/ephyrvideo.c b/hw/kdrive/ephyr/ephyrvideo.c index 2dbddfb8d4..cdf21304ee 100644 --- a/hw/kdrive/ephyr/ephyrvideo.c +++ b/hw/kdrive/ephyr/ephyrvideo.c @@ -26,9 +26,7 @@ * Dodji Seketeli */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include #include diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c index 40bfcf07fa..b7ac56d505 100644 --- a/hw/kdrive/ephyr/hostx.c +++ b/hw/kdrive/ephyr/hostx.c @@ -23,9 +23,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/hw/kdrive/src/kcmap.c b/hw/kdrive/src/kcmap.c index 2a8020f0ea..b19b90b088 100644 --- a/hw/kdrive/src/kcmap.c +++ b/hw/kdrive/src/kcmap.c @@ -20,9 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "kdrive.h" #include "dix/colormap_priv.h" diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c index aeefa01fb4..9144091a47 100644 --- a/hw/kdrive/src/kdrive.c +++ b/hw/kdrive/src/kdrive.c @@ -20,9 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "dix/screenint_priv.h" #include "os/cmdline.h" diff --git a/hw/kdrive/src/kinfo.c b/hw/kdrive/src/kinfo.c index 4abb082b02..9a15854137 100644 --- a/hw/kdrive/src/kinfo.c +++ b/hw/kdrive/src/kinfo.c @@ -20,9 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "kdrive.h" KdCardInfo *kdCardInfo; diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c index 9f3af8fb24..52c058f3e2 100644 --- a/hw/kdrive/src/kinput.c +++ b/hw/kdrive/src/kinput.c @@ -21,10 +21,8 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include #include -#endif #include "kdrive.h" #include "inputstr.h" diff --git a/hw/kdrive/src/kshadow.c b/hw/kdrive/src/kshadow.c index 0cc8a13092..292a03321b 100644 --- a/hw/kdrive/src/kshadow.c +++ b/hw/kdrive/src/kshadow.c @@ -20,9 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "kdrive.h" Bool diff --git a/hw/kdrive/src/kxv.c b/hw/kdrive/src/kxv.c index 9e284203e4..3077009a6c 100644 --- a/hw/kdrive/src/kxv.c +++ b/hw/kdrive/src/kxv.c @@ -35,9 +35,7 @@ of the copyright holder. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/hw/vfb/InitInput.c b/hw/vfb/InitInput.c index 21387dee4e..ca451604da 100644 --- a/hw/vfb/InitInput.c +++ b/hw/vfb/InitInput.c @@ -26,9 +26,7 @@ from The Open Group. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include "mi.h" diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c index 4ebd8b0584..4a448a5ae8 100644 --- a/hw/vfb/InitOutput.c +++ b/hw/vfb/InitOutput.c @@ -26,9 +26,7 @@ from The Open Group. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #if defined(WIN32) #include diff --git a/hw/xfree86/drivers/modesetting/dri2.c b/hw/xfree86/drivers/modesetting/dri2.c index db755613af..af7db7ddc3 100644 --- a/hw/xfree86/drivers/modesetting/dri2.c +++ b/hw/xfree86/drivers/modesetting/dri2.c @@ -32,9 +32,7 @@ * This doesn't implement pageflipping yet. */ -#ifdef HAVE_DIX_CONFIG_H #include "dix-config.h" -#endif #include #include diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c index a3d0b5197d..05e9e459f2 100644 --- a/hw/xfree86/drivers/modesetting/driver.c +++ b/hw/xfree86/drivers/modesetting/driver.c @@ -32,9 +32,7 @@ * */ -#ifdef HAVE_DIX_CONFIG_H #include "dix-config.h" -#endif #include #include diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c index a3e2931556..6d0b4453b0 100644 --- a/hw/xfree86/drivers/modesetting/drmmode_display.c +++ b/hw/xfree86/drivers/modesetting/drmmode_display.c @@ -27,9 +27,7 @@ * */ -#ifdef HAVE_DIX_CONFIG_H #include "dix-config.h" -#endif #include #include diff --git a/hw/xfree86/drivers/modesetting/dumb_bo.c b/hw/xfree86/drivers/modesetting/dumb_bo.c index cf13f0a9cd..cdff166ce7 100644 --- a/hw/xfree86/drivers/modesetting/dumb_bo.c +++ b/hw/xfree86/drivers/modesetting/dumb_bo.c @@ -25,9 +25,7 @@ * */ -#ifdef HAVE_DIX_CONFIG_H #include "dix-config.h" -#endif #include "dumb_bo.h" diff --git a/hw/xfree86/drivers/modesetting/pageflip.c b/hw/xfree86/drivers/modesetting/pageflip.c index 86849a0702..785c0d2d15 100644 --- a/hw/xfree86/drivers/modesetting/pageflip.c +++ b/hw/xfree86/drivers/modesetting/pageflip.c @@ -20,9 +20,7 @@ * OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include "dix-config.h" -#endif #include diff --git a/hw/xfree86/drivers/modesetting/present.c b/hw/xfree86/drivers/modesetting/present.c index 412fb5713d..8956a7c577 100644 --- a/hw/xfree86/drivers/modesetting/present.c +++ b/hw/xfree86/drivers/modesetting/present.c @@ -20,9 +20,7 @@ * OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include "dix-config.h" -#endif #include #include diff --git a/hw/xfree86/drivers/modesetting/vblank.c b/hw/xfree86/drivers/modesetting/vblank.c index c89aa3f17b..a406279c29 100644 --- a/hw/xfree86/drivers/modesetting/vblank.c +++ b/hw/xfree86/drivers/modesetting/vblank.c @@ -25,9 +25,7 @@ * Support for tracking the DRM's vblank events. */ -#ifdef HAVE_DIX_CONFIG_H #include "dix-config.h" -#endif #include #include diff --git a/hw/xfree86/glamor_egl/glamor_xf86_xv.c b/hw/xfree86/glamor_egl/glamor_xf86_xv.c index 5f8bb8f15f..5e0eb0afd0 100644 --- a/hw/xfree86/glamor_egl/glamor_xf86_xv.c +++ b/hw/xfree86/glamor_egl/glamor_xf86_xv.c @@ -34,9 +34,7 @@ * device-dependent XV interfaces. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #define GLAMOR_FOR_XORG #include "glamor_priv.h" diff --git a/hw/xfree86/xkb/xkbKillSrv.c b/hw/xfree86/xkb/xkbKillSrv.c index 79cf081982..d03674a943 100644 --- a/hw/xfree86/xkb/xkbKillSrv.c +++ b/hw/xfree86/xkb/xkbKillSrv.c @@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/xkb/xkbPrivate.c b/hw/xfree86/xkb/xkbPrivate.c index 506b60bb0d..54ba1e36f4 100644 --- a/hw/xfree86/xkb/xkbPrivate.c +++ b/hw/xfree86/xkb/xkbPrivate.c @@ -1,7 +1,5 @@ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xfree86/xkb/xkbVT.c b/hw/xfree86/xkb/xkbVT.c index 984096122d..463ff2362b 100644 --- a/hw/xfree86/xkb/xkbVT.c +++ b/hw/xfree86/xkb/xkbVT.c @@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #ifdef HAVE_XORG_CONFIG_H #include diff --git a/hw/xquartz/GL/capabilities.c b/hw/xquartz/GL/capabilities.c index 1744f12035..cc116b14ba 100644 --- a/hw/xquartz/GL/capabilities.c +++ b/hw/xquartz/GL/capabilities.c @@ -20,9 +20,7 @@ * DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/hw/xquartz/GL/glcontextmodes.c b/hw/xquartz/GL/glcontextmodes.c index 64a1ac7c4c..6e7f49af4a 100644 --- a/hw/xquartz/GL/glcontextmodes.c +++ b/hw/xquartz/GL/glcontextmodes.c @@ -34,9 +34,7 @@ #if defined(IN_MINI_GLX) #include #else -#if defined(HAVE_DIX_CONFIG_H) #include -#endif #include #include #include "GL/glxint.h" diff --git a/hw/xquartz/GL/indirect.c b/hw/xquartz/GL/indirect.c index a8ccfc8ee1..594c01a2c1 100644 --- a/hw/xquartz/GL/indirect.c +++ b/hw/xquartz/GL/indirect.c @@ -31,9 +31,7 @@ * DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/hw/xquartz/GL/visualConfigs.c b/hw/xquartz/GL/visualConfigs.c index e5c55d8ba2..4f327cdd8e 100644 --- a/hw/xquartz/GL/visualConfigs.c +++ b/hw/xquartz/GL/visualConfigs.c @@ -28,9 +28,7 @@ * DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "dri.h" diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m index dd96e89f7e..f6f83936a7 100644 --- a/hw/xquartz/X11Application.m +++ b/hw/xquartz/X11Application.m @@ -30,9 +30,7 @@ #include "sanitizedCarbon.h" -#ifdef HAVE_DIX_CONFIG_H #include -#endif #import "X11Application.h" #import "NSUserDefaults+XQuartzDefaults.h" diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m index e21aed0d31..4aaa87d062 100644 --- a/hw/xquartz/X11Controller.m +++ b/hw/xquartz/X11Controller.m @@ -30,9 +30,7 @@ #include "sanitizedCarbon.h" -#ifdef HAVE_DIX_CONFIG_H #include -#endif #import "X11Controller.h" #import "X11Application.h" diff --git a/hw/xquartz/applewm.c b/hw/xquartz/applewm.c index 4edab98e04..4441038f53 100644 --- a/hw/xquartz/applewm.c +++ b/hw/xquartz/applewm.c @@ -30,9 +30,7 @@ #include "sanitizedCarbon.h" -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c index 1ec244b036..45e79b6493 100644 --- a/hw/xquartz/darwin.c +++ b/hw/xquartz/darwin.c @@ -28,9 +28,7 @@ * use or other dealings in this Software without prior written authorization. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/hw/xquartz/darwinEvents.c b/hw/xquartz/darwinEvents.c index fd87e968b1..ea5693be16 100644 --- a/hw/xquartz/darwinEvents.c +++ b/hw/xquartz/darwinEvents.c @@ -40,9 +40,7 @@ #include "sanitizedCarbon.h" -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/hw/xquartz/darwinXinput.c b/hw/xquartz/darwinXinput.c index fea7e921ec..b9d475d63b 100644 --- a/hw/xquartz/darwinXinput.c +++ b/hw/xquartz/darwinXinput.c @@ -51,9 +51,7 @@ ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/hw/xquartz/mach-startup/bundle-main.c b/hw/xquartz/mach-startup/bundle-main.c index a2c18e1e15..f8598534fb 100644 --- a/hw/xquartz/mach-startup/bundle-main.c +++ b/hw/xquartz/mach-startup/bundle-main.c @@ -30,9 +30,7 @@ #include -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/hw/xquartz/mach-startup/launchd_fd.c b/hw/xquartz/mach-startup/launchd_fd.c index 15866cc42c..90e59cbfd0 100644 --- a/hw/xquartz/mach-startup/launchd_fd.c +++ b/hw/xquartz/mach-startup/launchd_fd.c @@ -26,9 +26,7 @@ * prior written authorization. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/hw/xquartz/mach-startup/stub.c b/hw/xquartz/mach-startup/stub.c index 83252e8055..5ab09d9a79 100644 --- a/hw/xquartz/mach-startup/stub.c +++ b/hw/xquartz/mach-startup/stub.c @@ -28,9 +28,7 @@ #include -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/hw/xquartz/quartz.c b/hw/xquartz/quartz.c index 38f5dbcdd6..9c3f594612 100644 --- a/hw/xquartz/quartz.c +++ b/hw/xquartz/quartz.c @@ -31,9 +31,7 @@ #include "sanitizedCarbon.h" -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "quartzRandR.h" #include "inputstr.h" diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c index c35a2d15d1..82b8d45b4a 100644 --- a/hw/xquartz/quartzKeyboard.c +++ b/hw/xquartz/quartzKeyboard.c @@ -33,9 +33,7 @@ #include "sanitizedCarbon.h" -#ifdef HAVE_DIX_CONFIG_H #include -#endif #define HACK_MISSING 1 #define HACK_KEYPAD 1 diff --git a/hw/xquartz/quartzRandR.c b/hw/xquartz/quartzRandR.c index 3ecc0e771d..48a8be82dc 100644 --- a/hw/xquartz/quartzRandR.c +++ b/hw/xquartz/quartzRandR.c @@ -31,9 +31,7 @@ #include "sanitizedCarbon.h" -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "quartzRandR.h" #include "quartz.h" diff --git a/hw/xquartz/quartzStartup.c b/hw/xquartz/quartzStartup.c index 77ff84506a..4c346433b2 100644 --- a/hw/xquartz/quartzStartup.c +++ b/hw/xquartz/quartzStartup.c @@ -29,9 +29,7 @@ #include "sanitizedCarbon.h" -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/hw/xquartz/xpr/appledri.c b/hw/xquartz/xpr/appledri.c index 40422b61a9..c9189c9d27 100644 --- a/hw/xquartz/xpr/appledri.c +++ b/hw/xquartz/xpr/appledri.c @@ -36,9 +36,7 @@ * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/hw/xquartz/xpr/dri.c b/hw/xquartz/xpr/dri.c index 091418e19c..952c85812c 100644 --- a/hw/xquartz/xpr/dri.c +++ b/hw/xquartz/xpr/dri.c @@ -34,9 +34,7 @@ * Jeremy Huddleston */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/hw/xquartz/xpr/driWrap.c b/hw/xquartz/xpr/driWrap.c index f588a834d6..cf63eb9fc6 100644 --- a/hw/xquartz/xpr/driWrap.c +++ b/hw/xquartz/xpr/driWrap.c @@ -27,9 +27,7 @@ * prior written authorization. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include "mi.h" diff --git a/hw/xquartz/xpr/x-hash.c b/hw/xquartz/xpr/x-hash.c index 087656d9b5..2108fe6ae7 100644 --- a/hw/xquartz/xpr/x-hash.c +++ b/hw/xquartz/xpr/x-hash.c @@ -28,9 +28,7 @@ * prior written authorization. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "x-hash.h" #include "x-list.h" diff --git a/hw/xquartz/xpr/x-hook.c b/hw/xquartz/xpr/x-hook.c index 3922bb86c1..7ea0d01fd7 100644 --- a/hw/xquartz/xpr/x-hook.c +++ b/hw/xquartz/xpr/x-hook.c @@ -28,9 +28,7 @@ * prior written authorization. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "x-hook.h" #include diff --git a/hw/xquartz/xpr/x-list.c b/hw/xquartz/xpr/x-list.c index 1716576868..0250ac549b 100644 --- a/hw/xquartz/xpr/x-list.c +++ b/hw/xquartz/xpr/x-list.c @@ -28,9 +28,7 @@ * prior written authorization. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "x-list.h" #include diff --git a/hw/xquartz/xpr/xprAppleWM.c b/hw/xquartz/xpr/xprAppleWM.c index 1266617661..ed031d2280 100644 --- a/hw/xquartz/xpr/xprAppleWM.c +++ b/hw/xquartz/xpr/xprAppleWM.c @@ -27,9 +27,7 @@ * use or other dealings in this Software without prior written authorization. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "xpr.h" diff --git a/hw/xquartz/xpr/xprCursor.c b/hw/xquartz/xpr/xprCursor.c index ff6cf4dd01..22b52344d7 100644 --- a/hw/xquartz/xpr/xprCursor.c +++ b/hw/xquartz/xpr/xprCursor.c @@ -31,9 +31,7 @@ #include "sanitizedCarbon.h" -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "quartz.h" #include "xpr.h" diff --git a/hw/xquartz/xpr/xprEvent.c b/hw/xquartz/xpr/xprEvent.c index eb321a52f1..7490da649b 100644 --- a/hw/xquartz/xpr/xprEvent.c +++ b/hw/xquartz/xpr/xprEvent.c @@ -26,9 +26,7 @@ * prior written authorization. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "xpr.h" diff --git a/hw/xquartz/xpr/xprFrame.c b/hw/xquartz/xpr/xprFrame.c index 57d16d42fa..9d88abbb6a 100644 --- a/hw/xquartz/xpr/xprFrame.c +++ b/hw/xquartz/xpr/xprFrame.c @@ -27,9 +27,7 @@ * use or other dealings in this Software without prior written authorization. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "xpr.h" #include "rootlessCommon.h" diff --git a/hw/xquartz/xpr/xprScreen.c b/hw/xquartz/xpr/xprScreen.c index 81de337698..f595748efc 100644 --- a/hw/xquartz/xpr/xprScreen.c +++ b/hw/xquartz/xpr/xprScreen.c @@ -29,9 +29,7 @@ #include "sanitizedCarbon.h" -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "inputstr.h" #include "quartz.h" diff --git a/hw/xwayland/xwayland-vidmode.c b/hw/xwayland/xwayland-vidmode.c index 77e57b1e4b..a4ca0eaf1a 100644 --- a/hw/xwayland/xwayland-vidmode.c +++ b/hw/xwayland/xwayland-vidmode.c @@ -25,9 +25,7 @@ * authorization from the copyright holder(s) and author(s). */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/hw/xwayland/xwayland-window.c b/hw/xwayland/xwayland-window.c index e5d45a9198..b717fcf3c4 100644 --- a/hw/xwayland/xwayland-window.c +++ b/hw/xwayland/xwayland-window.c @@ -23,9 +23,7 @@ * SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/hw/xwin/dri/windowsdri.c b/hw/xwin/dri/windowsdri.c index 3666e97dd6..5ed4450dab 100644 --- a/hw/xwin/dri/windowsdri.c +++ b/hw/xwin/dri/windowsdri.c @@ -21,9 +21,7 @@ * IN THE SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/mi/miarc.c b/mi/miarc.c index 3a0ecc4465..602ccbf767 100644 --- a/mi/miarc.c +++ b/mi/miarc.c @@ -46,9 +46,7 @@ SOFTWARE. /* Author: Keith Packard and Bob Scheifler */ /* Warning: this code is toxic, do not dally very long here. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/mi/micmap.c b/mi/micmap.c index 2c312845d0..e3675c3016 100644 --- a/mi/micmap.c +++ b/mi/micmap.c @@ -27,9 +27,7 @@ * are may be debatable. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/mi/micopy.c b/mi/micopy.c index 40096f24cc..f2bc9deefa 100644 --- a/mi/micopy.c +++ b/mi/micopy.c @@ -20,9 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "mi.h" #include "scrnintstr.h" diff --git a/mi/midash.c b/mi/midash.c index 08f11aa384..76bd4266d3 100644 --- a/mi/midash.c +++ b/mi/midash.c @@ -43,9 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "regionstr.h" #include "mistruct.h" diff --git a/mi/midispcur.c b/mi/midispcur.c index dc4928fd7a..305b6fc682 100644 --- a/mi/midispcur.c +++ b/mi/midispcur.c @@ -29,9 +29,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/mi/mieq.c b/mi/mieq.c index 850248ece2..bb15e2aa9a 100644 --- a/mi/mieq.c +++ b/mi/mieq.c @@ -32,9 +32,7 @@ in this Software without prior written authorization from The Open Group. * */ -#if HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/mi/miexpose.c b/mi/miexpose.c index 29ac46486a..7b13b034f8 100644 --- a/mi/miexpose.c +++ b/mi/miexpose.c @@ -71,9 +71,7 @@ Equipment Corporation. ******************************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/mi/mifillarc.c b/mi/mifillarc.c index 888519edfa..1f467db28b 100644 --- a/mi/mifillarc.c +++ b/mi/mifillarc.c @@ -26,9 +26,7 @@ Author: Bob Scheifler, MIT X Consortium ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/mi/migc.c b/mi/migc.c index bc2e1aede6..e4f3b547ea 100644 --- a/mi/migc.c +++ b/mi/migc.c @@ -26,9 +26,7 @@ from The Open Group. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "scrnintstr.h" #include "gcstruct.h" diff --git a/mi/miglblt.c b/mi/miglblt.c index 169d44ffcd..4314b4091f 100644 --- a/mi/miglblt.c +++ b/mi/miglblt.c @@ -44,9 +44,7 @@ SOFTWARE. ******************************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/mi/miinitext.c b/mi/miinitext.c index 04f3201185..348198b939 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -71,9 +71,7 @@ SOFTWARE. * authorization from the copyright holder(s) and author(s). */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #ifdef HAVE_XORG_CONFIG_H #include diff --git a/mi/mioverlay.c b/mi/mioverlay.c index 7a86cdfed2..5e380cd7e7 100644 --- a/mi/mioverlay.c +++ b/mi/mioverlay.c @@ -1,7 +1,5 @@ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/mi/mipointer.c b/mi/mipointer.c index 7c29d70d42..b4bf128bdd 100644 --- a/mi/mipointer.c +++ b/mi/mipointer.c @@ -46,9 +46,7 @@ in this Software without prior written authorization from The Open Group. * DIX, DDX and some drivers. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/mi/mipoly.c b/mi/mipoly.c index a97e2bb64e..3cdb56925e 100644 --- a/mi/mipoly.c +++ b/mi/mipoly.c @@ -48,9 +48,7 @@ SOFTWARE. * * Written by Brian Kelleher; June 1986 */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include "windowstr.h" diff --git a/mi/mipolypnt.c b/mi/mipolypnt.c index 1c4150dfb4..1f688a0281 100644 --- a/mi/mipolypnt.c +++ b/mi/mipolypnt.c @@ -43,9 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/mi/mipolyrect.c b/mi/mipolyrect.c index 7ebf9db8da..acec81fb3b 100644 --- a/mi/mipolyrect.c +++ b/mi/mipolyrect.c @@ -43,9 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/mi/mipolyseg.c b/mi/mipolyseg.c index 7909b398b4..cdfcba1ddb 100644 --- a/mi/mipolyseg.c +++ b/mi/mipolyseg.c @@ -43,9 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/mi/mipolytext.c b/mi/mipolytext.c index f1e5ed8674..ea3d1b0178 100644 --- a/mi/mipolytext.c +++ b/mi/mipolytext.c @@ -52,9 +52,7 @@ SOFTWARE. * Date: Thu Feb 5 1987 */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/mi/mipushpxl.c b/mi/mipushpxl.c index f6a1b52599..028b8633eb 100644 --- a/mi/mipushpxl.c +++ b/mi/mipushpxl.c @@ -43,9 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include "gcstruct.h" diff --git a/mi/miscrinit.c b/mi/miscrinit.c index 57571b9ab5..b80f74e634 100644 --- a/mi/miscrinit.c +++ b/mi/miscrinit.c @@ -26,9 +26,7 @@ from The Open Group. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/mi/misprite.c b/mi/misprite.c index 87e6fbe8e8..e832daa645 100644 --- a/mi/misprite.c +++ b/mi/misprite.c @@ -29,9 +29,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/mi/mivaltree.c b/mi/mivaltree.c index ea6889fdc0..0dff150c2b 100644 --- a/mi/mivaltree.c +++ b/mi/mivaltree.c @@ -88,9 +88,7 @@ Equipment Corporation. * Bob Scheifler -- avoid miComputeClips for unmapped windows, * valdata changes */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include "scrnintstr.h" diff --git a/mi/miwideline.c b/mi/miwideline.c index 6e02d70cbe..0d81519cf2 100644 --- a/mi/miwideline.c +++ b/mi/miwideline.c @@ -52,9 +52,7 @@ SOFTWARE. * bresenham zero-width lines, except walks an X edge */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #ifdef _XOPEN_SOURCE diff --git a/mi/miwindow.c b/mi/miwindow.c index 32debb48ef..40b81eec79 100644 --- a/mi/miwindow.c +++ b/mi/miwindow.c @@ -44,9 +44,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/mi/mizerarc.c b/mi/mizerarc.c index e1b5f0c18e..ca2cb40874 100644 --- a/mi/mizerarc.c +++ b/mi/mizerarc.c @@ -32,9 +32,7 @@ Author: Bob Scheifler, MIT X Consortium * The Computer Journal, November 1967, Volume 10, Number 3, pp. 282-289 */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/mi/mizerclip.c b/mi/mizerclip.c index 0ae9641902..e3e2b96162 100644 --- a/mi/mizerclip.c +++ b/mi/mizerclip.c @@ -43,9 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/mi/mizerline.c b/mi/mizerline.c index 1a0ca34277..dc4790ba84 100644 --- a/mi/mizerline.c +++ b/mi/mizerline.c @@ -43,9 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/miext/damage/damage.c b/miext/damage/damage.c index 0ed392ca20..592f07bfe7 100644 --- a/miext/damage/damage.c +++ b/miext/damage/damage.c @@ -20,9 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/miext/rootless/rootlessCommon.c b/miext/rootless/rootlessCommon.c index 44c2c37898..6ca58c5c14 100644 --- a/miext/rootless/rootlessCommon.c +++ b/miext/rootless/rootlessCommon.c @@ -29,9 +29,7 @@ * use or other dealings in this Software without prior written authorization. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include /* For NULL */ #include /* For CHAR_BIT */ diff --git a/miext/rootless/rootlessGC.c b/miext/rootless/rootlessGC.c index 5af18a4a0c..1f68228317 100644 --- a/miext/rootless/rootlessGC.c +++ b/miext/rootless/rootlessGC.c @@ -29,9 +29,7 @@ * use or other dealings in this Software without prior written authorization. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include /* For NULL */ #include "mi.h" diff --git a/miext/rootless/rootlessScreen.c b/miext/rootless/rootlessScreen.c index 5d9c3e5977..b570182426 100644 --- a/miext/rootless/rootlessScreen.c +++ b/miext/rootless/rootlessScreen.c @@ -29,9 +29,7 @@ * use or other dealings in this Software without prior written authorization. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/miext/rootless/rootlessValTree.c b/miext/rootless/rootlessValTree.c index 409e6a0921..e311021db7 100644 --- a/miext/rootless/rootlessValTree.c +++ b/miext/rootless/rootlessValTree.c @@ -89,9 +89,7 @@ Equipment Corporation. * Bob Scheifler -- avoid miComputeClips for unmapped windows, * valdata changes */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include /* For NULL */ #include diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c index 643dedff65..68df06c89a 100644 --- a/miext/rootless/rootlessWindow.c +++ b/miext/rootless/rootlessWindow.c @@ -29,9 +29,7 @@ * use or other dealings in this Software without prior written authorization. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include /* For NULL */ #include /* For CHAR_BIT */ diff --git a/miext/shadow/sh3224.c b/miext/shadow/sh3224.c index 5d8f27482b..e93b5a7fda 100644 --- a/miext/shadow/sh3224.c +++ b/miext/shadow/sh3224.c @@ -20,9 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include "dix-config.h" -#endif #include "shadow.h" #include "fb.h" diff --git a/miext/shadow/shadow.c b/miext/shadow/shadow.c index e8d0d51b03..cecedee7d5 100644 --- a/miext/shadow/shadow.c +++ b/miext/shadow/shadow.c @@ -20,9 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/miext/shadow/shafb4.c b/miext/shadow/shafb4.c index ae59e2d32c..5610ad6bcd 100644 --- a/miext/shadow/shafb4.c +++ b/miext/shadow/shafb4.c @@ -23,9 +23,7 @@ * Based on shpacked.c, which is Copyright © 2000 Keith Packard */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/miext/shadow/shafb8.c b/miext/shadow/shafb8.c index d2b73fc643..7bb72031db 100644 --- a/miext/shadow/shafb8.c +++ b/miext/shadow/shafb8.c @@ -23,9 +23,7 @@ * Based on shpacked.c, which is Copyright © 2000 Keith Packard */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/miext/shadow/shiplan2p4.c b/miext/shadow/shiplan2p4.c index f37c58d718..ac46bb8b7e 100644 --- a/miext/shadow/shiplan2p4.c +++ b/miext/shadow/shiplan2p4.c @@ -23,9 +23,7 @@ * Based on shpacked.c, which is Copyright © 2000 Keith Packard */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/miext/shadow/shiplan2p8.c b/miext/shadow/shiplan2p8.c index 44cb8d3365..01a5c076f1 100644 --- a/miext/shadow/shiplan2p8.c +++ b/miext/shadow/shiplan2p8.c @@ -23,9 +23,7 @@ * Based on shpacked.c, which is Copyright © 2000 Keith Packard */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/miext/shadow/shpacked.c b/miext/shadow/shpacked.c index 5220854c1b..25c0dd1baf 100644 --- a/miext/shadow/shpacked.c +++ b/miext/shadow/shpacked.c @@ -21,9 +21,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/miext/shadow/shplanar.c b/miext/shadow/shplanar.c index 92c7971d23..4c5cf951a4 100644 --- a/miext/shadow/shplanar.c +++ b/miext/shadow/shplanar.c @@ -21,9 +21,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/miext/shadow/shplanar8.c b/miext/shadow/shplanar8.c index 412335940b..622430b2b2 100644 --- a/miext/shadow/shplanar8.c +++ b/miext/shadow/shplanar8.c @@ -21,9 +21,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/miext/shadow/shrot16pack.c b/miext/shadow/shrot16pack.c index 0b7faca6ae..a4fad6d462 100644 --- a/miext/shadow/shrot16pack.c +++ b/miext/shadow/shrot16pack.c @@ -23,8 +23,6 @@ #define FUNC shadowUpdateRotate16 #define Data CARD16 -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "shrotpack.h" diff --git a/miext/shadow/shrot16pack_180.c b/miext/shadow/shrot16pack_180.c index d8f2633e51..746351e754 100644 --- a/miext/shadow/shrot16pack_180.c +++ b/miext/shadow/shrot16pack_180.c @@ -24,8 +24,6 @@ #define Data CARD16 #define ROTATE 180 -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "shrotpack.h" diff --git a/miext/shadow/shrot16pack_270.c b/miext/shadow/shrot16pack_270.c index 4aa4713251..fd8b5f68d0 100644 --- a/miext/shadow/shrot16pack_270.c +++ b/miext/shadow/shrot16pack_270.c @@ -24,8 +24,6 @@ #define Data CARD16 #define ROTATE 270 -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "shrotpack.h" diff --git a/miext/shadow/shrot16pack_270YX.c b/miext/shadow/shrot16pack_270YX.c index 0df1fd51f0..5386bb4da1 100644 --- a/miext/shadow/shrot16pack_270YX.c +++ b/miext/shadow/shrot16pack_270YX.c @@ -24,8 +24,6 @@ #define Data CARD16 #define ROTATE 270 -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "shrotpackYX.h" diff --git a/miext/shadow/shrot16pack_90.c b/miext/shadow/shrot16pack_90.c index 81e49151a1..4a8848f651 100644 --- a/miext/shadow/shrot16pack_90.c +++ b/miext/shadow/shrot16pack_90.c @@ -24,8 +24,6 @@ #define Data CARD16 #define ROTATE 90 -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "shrotpack.h" diff --git a/miext/shadow/shrot16pack_90YX.c b/miext/shadow/shrot16pack_90YX.c index 5fc3b236ad..77fd870581 100644 --- a/miext/shadow/shrot16pack_90YX.c +++ b/miext/shadow/shrot16pack_90YX.c @@ -24,8 +24,6 @@ #define Data CARD16 #define ROTATE 90 -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "shrotpackYX.h" diff --git a/miext/shadow/shrot32pack.c b/miext/shadow/shrot32pack.c index 4a9cbc0ffe..083e21661b 100644 --- a/miext/shadow/shrot32pack.c +++ b/miext/shadow/shrot32pack.c @@ -23,8 +23,6 @@ #define FUNC shadowUpdateRotate32 #define Data CARD32 -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "shrotpack.h" diff --git a/miext/shadow/shrot32pack_180.c b/miext/shadow/shrot32pack_180.c index 8f5fb5760e..29cde5060c 100644 --- a/miext/shadow/shrot32pack_180.c +++ b/miext/shadow/shrot32pack_180.c @@ -24,8 +24,6 @@ #define Data CARD32 #define ROTATE 180 -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "shrotpack.h" diff --git a/miext/shadow/shrot32pack_270.c b/miext/shadow/shrot32pack_270.c index 7d52fd2bfb..d25d20e39e 100644 --- a/miext/shadow/shrot32pack_270.c +++ b/miext/shadow/shrot32pack_270.c @@ -24,8 +24,6 @@ #define Data CARD32 #define ROTATE 270 -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "shrotpack.h" diff --git a/miext/shadow/shrot32pack_90.c b/miext/shadow/shrot32pack_90.c index 0abeb5cdd3..36aabc1114 100644 --- a/miext/shadow/shrot32pack_90.c +++ b/miext/shadow/shrot32pack_90.c @@ -24,8 +24,6 @@ #define Data CARD32 #define ROTATE 90 -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "shrotpack.h" diff --git a/miext/shadow/shrot8pack.c b/miext/shadow/shrot8pack.c index 552d838f33..3e583b0212 100644 --- a/miext/shadow/shrot8pack.c +++ b/miext/shadow/shrot8pack.c @@ -23,8 +23,6 @@ #define FUNC shadowUpdateRotate8 #define Data CARD8 -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "shrotpack.h" diff --git a/miext/shadow/shrot8pack_180.c b/miext/shadow/shrot8pack_180.c index 526d8f15f4..2cf3131279 100644 --- a/miext/shadow/shrot8pack_180.c +++ b/miext/shadow/shrot8pack_180.c @@ -24,8 +24,6 @@ #define Data CARD8 #define ROTATE 180 -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "shrotpack.h" diff --git a/miext/shadow/shrot8pack_270.c b/miext/shadow/shrot8pack_270.c index 73f82a712c..16ef5df141 100644 --- a/miext/shadow/shrot8pack_270.c +++ b/miext/shadow/shrot8pack_270.c @@ -24,8 +24,6 @@ #define Data CARD8 #define ROTATE 270 -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "shrotpack.h" diff --git a/miext/shadow/shrot8pack_90.c b/miext/shadow/shrot8pack_90.c index 73060cad19..b5e4fb9918 100644 --- a/miext/shadow/shrot8pack_90.c +++ b/miext/shadow/shrot8pack_90.c @@ -24,8 +24,6 @@ #define Data CARD8 #define ROTATE 90 -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "shrotpack.h" diff --git a/miext/shadow/shrotate.c b/miext/shadow/shrotate.c index 1745537882..ec90fa5fe1 100644 --- a/miext/shadow/shrotate.c +++ b/miext/shadow/shrotate.c @@ -21,9 +21,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include "scrnintstr.h" diff --git a/miext/sync/misync.c b/miext/sync/misync.c index 48234ef8aa..806f7adbe0 100644 --- a/miext/sync/misync.c +++ b/miext/sync/misync.c @@ -21,9 +21,7 @@ * DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "scrnintstr.h" #include "misync_priv.h" diff --git a/miext/sync/misyncfd.c b/miext/sync/misyncfd.c index 9179311689..c2ad550c19 100644 --- a/miext/sync/misyncfd.c +++ b/miext/sync/misyncfd.c @@ -20,9 +20,7 @@ * OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "dix/input_priv.h" diff --git a/miext/sync/misyncshm.c b/miext/sync/misyncshm.c index 1e8865e890..fa163a3df3 100644 --- a/miext/sync/misyncshm.c +++ b/miext/sync/misyncshm.c @@ -20,9 +20,7 @@ * OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/os/WaitFor.c b/os/WaitFor.c index c88cdfcfe9..dac1b83b45 100644 --- a/os/WaitFor.c +++ b/os/WaitFor.c @@ -52,9 +52,7 @@ SOFTWARE. * *****************************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/os/access.c b/os/access.c index abf099cf60..d3fce1ec66 100644 --- a/os/access.c +++ b/os/access.c @@ -76,9 +76,7 @@ SOFTWARE. * DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #ifdef WIN32 #include diff --git a/os/auth.c b/os/auth.c index e768060fea..de2aae9172 100644 --- a/os/auth.c +++ b/os/auth.c @@ -31,9 +31,7 @@ from The Open Group. * Author: Keith Packard, MIT X Consortium */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/os/backtrace.c b/os/backtrace.c index 659126a6aa..767f909b78 100644 --- a/os/backtrace.c +++ b/os/backtrace.c @@ -21,9 +21,7 @@ * DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "os.h" #include "misc.h" diff --git a/os/busfault.c b/os/busfault.c index 7e6d4612e0..3f653965c9 100644 --- a/os/busfault.c +++ b/os/busfault.c @@ -20,9 +20,7 @@ * OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/os/connection.c b/os/connection.c index f7eb95b1ea..0b81106a5d 100644 --- a/os/connection.c +++ b/os/connection.c @@ -60,9 +60,7 @@ SOFTWARE. * *****************************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #ifdef WIN32 #include diff --git a/os/inputthread.c b/os/inputthread.c index 132940f982..623648256c 100644 --- a/os/inputthread.c +++ b/os/inputthread.c @@ -25,9 +25,7 @@ * Tiago Vignatti */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/os/io.c b/os/io.c index d4c03f3a75..b0c314a4de 100644 --- a/os/io.c +++ b/os/io.c @@ -51,9 +51,7 @@ SOFTWARE. * *****************************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #undef DEBUG_COMMUNICATION diff --git a/os/mitauth.c b/os/mitauth.c index 44e3329c23..4383ac7aeb 100644 --- a/os/mitauth.c +++ b/os/mitauth.c @@ -31,9 +31,7 @@ from The Open Group. * Author: Keith Packard, MIT X Consortium */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include "os.h" diff --git a/os/osinit.c b/os/osinit.c index d376be7801..6e1d822e2a 100644 --- a/os/osinit.c +++ b/os/osinit.c @@ -44,9 +44,7 @@ SOFTWARE. ******************************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/os/ospoll.c b/os/ospoll.c index 71410a2e27..dc2ecd10fc 100644 --- a/os/ospoll.c +++ b/os/ospoll.c @@ -20,9 +20,7 @@ * OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/os/reallocarray.c b/os/reallocarray.c index c415e09af8..3c34f7ff9a 100644 --- a/os/reallocarray.c +++ b/os/reallocarray.c @@ -15,9 +15,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/os/strcasecmp.c b/os/strcasecmp.c index 2692f7f1e5..50c2a35286 100644 --- a/os/strcasecmp.c +++ b/os/strcasecmp.c @@ -27,9 +27,7 @@ * SUCH DAMAGE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include "dix.h" diff --git a/os/strcasestr.c b/os/strcasestr.c index 4e483a940a..771bb00e4f 100644 --- a/os/strcasestr.c +++ b/os/strcasestr.c @@ -30,9 +30,7 @@ * SUCH DAMAGE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/os/strlcat.c b/os/strlcat.c index 316dfa9d12..538e7ab3f0 100644 --- a/os/strlcat.c +++ b/os/strlcat.c @@ -14,9 +14,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/os/strlcpy.c b/os/strlcpy.c index 52e7203b21..82c158a9fa 100644 --- a/os/strlcpy.c +++ b/os/strlcpy.c @@ -14,9 +14,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/os/strndup.c b/os/strndup.c index e0eddf13d8..4606ab413d 100644 --- a/os/strndup.c +++ b/os/strndup.c @@ -27,9 +27,7 @@ * SUCH DAMAGE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/os/utils.c b/os/utils.c index 6db344403a..eb69980ad2 100644 --- a/os/utils.c +++ b/os/utils.c @@ -48,9 +48,7 @@ OR PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #ifdef __CYGWIN__ #include diff --git a/os/xdmauth.c b/os/xdmauth.c index 21b79e9430..3a676e1880 100644 --- a/os/xdmauth.c +++ b/os/xdmauth.c @@ -33,9 +33,7 @@ from The Open Group. * Author: Keith Packard, MIT X Consortium */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/os/xdmcp.c b/os/xdmcp.c index 7546d8309f..4a12cae5bc 100644 --- a/os/xdmcp.c +++ b/os/xdmcp.c @@ -13,9 +13,7 @@ * */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #ifdef WIN32 #include diff --git a/os/xprintf.c b/os/xprintf.c index e19e1ca037..9e93ac9b29 100644 --- a/os/xprintf.c +++ b/os/xprintf.c @@ -56,9 +56,7 @@ * DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include "os.h" diff --git a/os/xserver_poll.c b/os/xserver_poll.c index ff31b7890a..64b94f1994 100644 --- a/os/xserver_poll.c +++ b/os/xserver_poll.c @@ -73,9 +73,7 @@ Includes \*---------------------------------------------------------------------------*/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include /* standard Unix definitions */ #include /* system types */ diff --git a/os/xsha1.c b/os/xsha1.c index f2863f5233..a1a2448af5 100644 --- a/os/xsha1.c +++ b/os/xsha1.c @@ -23,9 +23,7 @@ * DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "os.h" #include "os/xsha1.h" diff --git a/os/xstrans.c b/os/xstrans.c index 2bc79e7aea..c9363db71d 100644 --- a/os/xstrans.c +++ b/os/xstrans.c @@ -1,16 +1,7 @@ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include -/* ErrorF is used by xtrans */ -#ifndef HAVE_DIX_CONFIG_H -extern _X_EXPORT void -ErrorF(const char *f, ...) -_X_ATTRIBUTE_PRINTF(1, 2); -#endif - #define TRANS_REOPEN #define TRANS_SERVER #define XSERV_t diff --git a/pseudoramiX/pseudoramiX.c b/pseudoramiX/pseudoramiX.c index 0906ac030b..233f91704c 100644 --- a/pseudoramiX/pseudoramiX.c +++ b/pseudoramiX/pseudoramiX.c @@ -33,9 +33,7 @@ Equipment Corporation. ******************************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/randr/randr.c b/randr/randr.c index 3cb4cbd39f..7e79ec9921 100644 --- a/randr/randr.c +++ b/randr/randr.c @@ -26,9 +26,7 @@ * Keith Packard, Intel Corporation */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "randrstr_priv.h" #include "extinit_priv.h" diff --git a/record/record.c b/record/record.c index 748088db81..6572b8e925 100644 --- a/record/record.c +++ b/record/record.c @@ -32,9 +32,7 @@ and Jim Haggerty of Metheus. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "dix/cursor_priv.h" #include "dix/eventconvert.h" diff --git a/record/set.c b/record/set.c index 74e40d93ed..f071a4b3fe 100644 --- a/record/set.c +++ b/record/set.c @@ -45,9 +45,7 @@ from The Open Group. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/render/animcur.c b/render/animcur.c index f02383c35f..f906cd8130 100644 --- a/render/animcur.c +++ b/render/animcur.c @@ -31,9 +31,7 @@ * delta times between each image. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/render/filter.c b/render/filter.c index 44f6b64650..546998a92c 100644 --- a/render/filter.c +++ b/render/filter.c @@ -20,9 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #define XK_LATIN1 #include diff --git a/render/glyph.c b/render/glyph.c index 5fa7f3b5b4..57aa46789f 100644 --- a/render/glyph.c +++ b/render/glyph.c @@ -22,9 +22,7 @@ * Author: Keith Packard, SuSE, Inc. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "os/xsha1.h" diff --git a/render/matrix.c b/render/matrix.c index 83cd66c43f..2d66e71de9 100644 --- a/render/matrix.c +++ b/render/matrix.c @@ -20,9 +20,7 @@ * OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "misc.h" #include "scrnintstr.h" diff --git a/render/miindex.c b/render/miindex.c index 7892b66fff..c1926e8989 100644 --- a/render/miindex.c +++ b/render/miindex.c @@ -21,9 +21,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #ifndef _MIINDEX_H_ #define _MIINDEX_H_ diff --git a/render/mipict.c b/render/mipict.c index 7fb03435bd..b80b581726 100644 --- a/render/mipict.c +++ b/render/mipict.c @@ -21,9 +21,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "scrnintstr.h" #include "gcstruct.h" diff --git a/render/mirect.c b/render/mirect.c index 65f8d5efdb..6302ec7f11 100644 --- a/render/mirect.c +++ b/render/mirect.c @@ -21,9 +21,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "scrnintstr.h" #include "gcstruct.h" diff --git a/render/mitrap.c b/render/mitrap.c index 17b6dcd1c5..cccaf6f4ad 100644 --- a/render/mitrap.c +++ b/render/mitrap.c @@ -21,9 +21,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "scrnintstr.h" #include "gcstruct.h" diff --git a/render/mitri.c b/render/mitri.c index 922f22a6ae..8766315741 100644 --- a/render/mitri.c +++ b/render/mitri.c @@ -21,9 +21,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "scrnintstr.h" #include "gcstruct.h" diff --git a/render/picture.c b/render/picture.c index d41a0ed91f..a6091f0ee7 100644 --- a/render/picture.c +++ b/render/picture.c @@ -22,9 +22,7 @@ * Author: Keith Packard, SuSE, Inc. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "dix/colormap_priv.h" diff --git a/render/render.c b/render/render.c index 122bfead1e..b43d8d9c95 100644 --- a/render/render.c +++ b/render/render.c @@ -22,9 +22,7 @@ * Author: Keith Packard, SuSE, Inc. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/test/fixes.c b/test/fixes.c index b5d57cf8ff..454cccb4f9 100644 --- a/test/fixes.c +++ b/test/fixes.c @@ -24,9 +24,7 @@ /* Test relies on assert() */ #undef NDEBUG -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/test/hashtabletest.c b/test/hashtabletest.c index 59c39b4642..47225e44aa 100644 --- a/test/hashtabletest.c +++ b/test/hashtabletest.c @@ -1,6 +1,4 @@ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/test/input.c b/test/input.c index dffde35557..6e5e83b5a1 100644 --- a/test/input.c +++ b/test/input.c @@ -24,9 +24,7 @@ /* Test relies on assert() */ #undef NDEBUG -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/test/list.c b/test/list.c index 06a9afc1ea..dbb7a768d4 100644 --- a/test/list.c +++ b/test/list.c @@ -24,9 +24,7 @@ /* Test relies on assert() */ #undef NDEBUG -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/test/misc.c b/test/misc.c index 5bf7193128..bcb789ae98 100644 --- a/test/misc.c +++ b/test/misc.c @@ -24,9 +24,7 @@ /* Test relies on assert() */ #undef NDEBUG -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/test/signal-logging.c b/test/signal-logging.c index 22966ed4c3..db8efa8523 100644 --- a/test/signal-logging.c +++ b/test/signal-logging.c @@ -24,9 +24,7 @@ /* Test relies on assert() */ #undef NDEBUG -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/test/simple-xinit.c b/test/simple-xinit.c index 57e7eed577..39daf54c96 100644 --- a/test/simple-xinit.c +++ b/test/simple-xinit.c @@ -21,9 +21,7 @@ * IN THE SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/test/string.c b/test/string.c index 6fa4882d93..be971e623a 100644 --- a/test/string.c +++ b/test/string.c @@ -29,9 +29,7 @@ /* Test relies on assert() */ #undef NDEBUG -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include "os.h" diff --git a/test/test_xkb.c b/test/test_xkb.c index 303bbec53f..2fd9d1f361 100644 --- a/test/test_xkb.c +++ b/test/test_xkb.c @@ -24,9 +24,7 @@ /* Test relies on assert() */ #undef NDEBUG -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/test/touch.c b/test/touch.c index 86dcc32de0..3e9100a9fd 100644 --- a/test/touch.c +++ b/test/touch.c @@ -24,9 +24,7 @@ /* Test relies on assert() */ #undef NDEBUG -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/test/xfree86.c b/test/xfree86.c index 7cbd37f404..d964f0b0be 100644 --- a/test/xfree86.c +++ b/test/xfree86.c @@ -24,9 +24,7 @@ /* Test relies on assert() */ #undef NDEBUG -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/test/xi1/protocol-xchangedevicecontrol.c b/test/xi1/protocol-xchangedevicecontrol.c index 4c1a1740a2..1ec1d1a265 100644 --- a/test/xi1/protocol-xchangedevicecontrol.c +++ b/test/xi1/protocol-xchangedevicecontrol.c @@ -24,9 +24,7 @@ /* Test relies on assert() */ #undef NDEBUG -#ifdef HAVE_DIX_CONFIG_H #include -#endif /* * Protocol testing for ChangeDeviceControl request. diff --git a/test/xi2/protocol-common.c b/test/xi2/protocol-common.c index aae84180ac..821b4b132b 100644 --- a/test/xi2/protocol-common.c +++ b/test/xi2/protocol-common.c @@ -24,9 +24,7 @@ /* Test relies on assert() */ #undef NDEBUG -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/test/xi2/protocol-eventconvert.c b/test/xi2/protocol-eventconvert.c index e1317ca1b2..f340838c27 100644 --- a/test/xi2/protocol-eventconvert.c +++ b/test/xi2/protocol-eventconvert.c @@ -23,9 +23,7 @@ /* Test relies on assert() */ #undef NDEBUG -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/test/xi2/protocol-xigetclientpointer.c b/test/xi2/protocol-xigetclientpointer.c index 6a066b0221..f01199e84f 100644 --- a/test/xi2/protocol-xigetclientpointer.c +++ b/test/xi2/protocol-xigetclientpointer.c @@ -24,9 +24,7 @@ /* Test relies on assert() */ #undef NDEBUG -#ifdef HAVE_DIX_CONFIG_H #include -#endif /* * Protocol testing for XIGetClientPointer request. diff --git a/test/xi2/protocol-xigetselectedevents.c b/test/xi2/protocol-xigetselectedevents.c index 937b52b2ed..33cd899f44 100644 --- a/test/xi2/protocol-xigetselectedevents.c +++ b/test/xi2/protocol-xigetselectedevents.c @@ -24,9 +24,7 @@ /* Test relies on assert() */ #undef NDEBUG -#ifdef HAVE_DIX_CONFIG_H #include -#endif /* * Protocol testing for XIGetSelectedEvents request. diff --git a/test/xi2/protocol-xipassivegrabdevice.c b/test/xi2/protocol-xipassivegrabdevice.c index bc98664931..2146462b09 100644 --- a/test/xi2/protocol-xipassivegrabdevice.c +++ b/test/xi2/protocol-xipassivegrabdevice.c @@ -24,9 +24,7 @@ /* Test relies on assert() */ #undef NDEBUG -#ifdef HAVE_DIX_CONFIG_H #include -#endif /* * Protocol testing for XIPassiveGrab request. diff --git a/test/xi2/protocol-xiquerydevice.c b/test/xi2/protocol-xiquerydevice.c index f0b03a19ad..daa3f60243 100644 --- a/test/xi2/protocol-xiquerydevice.c +++ b/test/xi2/protocol-xiquerydevice.c @@ -24,9 +24,7 @@ /* Test relies on assert() */ #undef NDEBUG -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/test/xi2/protocol-xiquerypointer.c b/test/xi2/protocol-xiquerypointer.c index 394fc7c00f..8a7ae608be 100644 --- a/test/xi2/protocol-xiquerypointer.c +++ b/test/xi2/protocol-xiquerypointer.c @@ -24,9 +24,7 @@ /* Test relies on assert() */ #undef NDEBUG -#ifdef HAVE_DIX_CONFIG_H #include -#endif /* * Protocol testing for XIQueryPointer request. diff --git a/test/xi2/protocol-xiqueryversion.c b/test/xi2/protocol-xiqueryversion.c index b8145bc1c3..f452333e67 100644 --- a/test/xi2/protocol-xiqueryversion.c +++ b/test/xi2/protocol-xiqueryversion.c @@ -24,9 +24,7 @@ /* Test relies on assert() */ #undef NDEBUG -#ifdef HAVE_DIX_CONFIG_H #include -#endif /* * Protocol testing for XIQueryVersion request and reply. diff --git a/test/xi2/protocol-xiselectevents.c b/test/xi2/protocol-xiselectevents.c index 9389bd27ea..612cb6bdb0 100644 --- a/test/xi2/protocol-xiselectevents.c +++ b/test/xi2/protocol-xiselectevents.c @@ -24,9 +24,7 @@ /* Test relies on assert() */ #undef NDEBUG -#ifdef HAVE_DIX_CONFIG_H #include -#endif /* * Protocol testing for XISelectEvents request. diff --git a/test/xi2/protocol-xisetclientpointer.c b/test/xi2/protocol-xisetclientpointer.c index 881fcf3f14..d47baea7d7 100644 --- a/test/xi2/protocol-xisetclientpointer.c +++ b/test/xi2/protocol-xisetclientpointer.c @@ -24,9 +24,7 @@ /* Test relies on assert() */ #undef NDEBUG -#ifdef HAVE_DIX_CONFIG_H #include -#endif /* * Protocol testing for XISetClientPointer request. diff --git a/test/xi2/protocol-xiwarppointer.c b/test/xi2/protocol-xiwarppointer.c index 417d9adfc0..d225e79edd 100644 --- a/test/xi2/protocol-xiwarppointer.c +++ b/test/xi2/protocol-xiwarppointer.c @@ -24,9 +24,7 @@ /* Test relies on assert() */ #undef NDEBUG -#ifdef HAVE_DIX_CONFIG_H #include -#endif /* * Protocol testing for XIWarpPointer request. diff --git a/test/xi2/xi2.c b/test/xi2/xi2.c index 03022ebfa9..b49a8fe8db 100644 --- a/test/xi2/xi2.c +++ b/test/xi2/xi2.c @@ -24,9 +24,7 @@ /* Test relies on assert() */ #undef NDEBUG -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include "inpututils.h" diff --git a/test/xtest.c b/test/xtest.c index f37863cd86..e1057b82c3 100644 --- a/test/xtest.c +++ b/test/xtest.c @@ -24,9 +24,7 @@ /* Test relies on assert() */ #undef NDEBUG -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/xfixes/cursor.c b/xfixes/cursor.c index 05f79d36cb..561e20805b 100644 --- a/xfixes/cursor.c +++ b/xfixes/cursor.c @@ -42,9 +42,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "dix/cursor_priv.h" #include "dix/dix_priv.h" diff --git a/xfixes/disconnect.c b/xfixes/disconnect.c index e2140572a0..73aa7cfc86 100644 --- a/xfixes/disconnect.c +++ b/xfixes/disconnect.c @@ -42,9 +42,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "dix/dix_priv.h" diff --git a/xfixes/region.c b/xfixes/region.c index 4595f8f2db..019287e045 100644 --- a/xfixes/region.c +++ b/xfixes/region.c @@ -20,9 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "dix/dix_priv.h" #include "render/picturestr_priv.h" diff --git a/xfixes/saveset.c b/xfixes/saveset.c index 981d15b866..3db5c66349 100644 --- a/xfixes/saveset.c +++ b/xfixes/saveset.c @@ -20,9 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "dix/dix_priv.h" diff --git a/xfixes/select.c b/xfixes/select.c index 660eed210d..81b1511999 100644 --- a/xfixes/select.c +++ b/xfixes/select.c @@ -20,9 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "dix/dix_priv.h" diff --git a/xfixes/xfixes.c b/xfixes/xfixes.c index 69b8241a4c..4943676734 100644 --- a/xfixes/xfixes.c +++ b/xfixes/xfixes.c @@ -42,9 +42,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "xfixesint.h" #include "protocol-versions.h" diff --git a/xkb/XKBAlloc.c b/xkb/XKBAlloc.c index 18557b804a..504687ce5f 100644 --- a/xkb/XKBAlloc.c +++ b/xkb/XKBAlloc.c @@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/xkb/XKBGAlloc.c b/xkb/XKBGAlloc.c index f0cda24fe9..d0cc51e999 100644 --- a/xkb/XKBGAlloc.c +++ b/xkb/XKBGAlloc.c @@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/xkb/XKBMAlloc.c b/xkb/XKBMAlloc.c index fa4c86d445..46b61f53c8 100644 --- a/xkb/XKBMAlloc.c +++ b/xkb/XKBMAlloc.c @@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/xkb/XKBMisc.c b/xkb/XKBMisc.c index 0a3b5cbc78..cf582cffda 100644 --- a/xkb/XKBMisc.c +++ b/xkb/XKBMisc.c @@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/xkb/ddxBeep.c b/xkb/ddxBeep.c index 52353ea81b..86b6e7c999 100644 --- a/xkb/ddxBeep.c +++ b/xkb/ddxBeep.c @@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/xkb/ddxCtrls.c b/xkb/ddxCtrls.c index 964ac3d516..e542a37f1b 100644 --- a/xkb/ddxCtrls.c +++ b/xkb/ddxCtrls.c @@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/xkb/ddxKillSrv.c b/xkb/ddxKillSrv.c index 7c7e73970e..e4531388c2 100644 --- a/xkb/ddxKillSrv.c +++ b/xkb/ddxKillSrv.c @@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/xkb/ddxLEDs.c b/xkb/ddxLEDs.c index e5aecb5232..e6520ea768 100644 --- a/xkb/ddxLEDs.c +++ b/xkb/ddxLEDs.c @@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c index abf2139702..379a555b48 100644 --- a/xkb/ddxLoad.c +++ b/xkb/ddxLoad.c @@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/xkb/ddxPrivate.c b/xkb/ddxPrivate.c index fcde3a18c9..26faaa5638 100644 --- a/xkb/ddxPrivate.c +++ b/xkb/ddxPrivate.c @@ -1,7 +1,5 @@ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include "windowstr.h" diff --git a/xkb/ddxVT.c b/xkb/ddxVT.c index f3cd26a97e..91b6900716 100644 --- a/xkb/ddxVT.c +++ b/xkb/ddxVT.c @@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/xkb/maprules.c b/xkb/maprules.c index e071ab539d..0b6c107aea 100644 --- a/xkb/maprules.c +++ b/xkb/maprules.c @@ -24,9 +24,7 @@ ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/xkb/xkb.c b/xkb/xkb.c index f203270d5c..751b4acfb3 100644 --- a/xkb/xkb.c +++ b/xkb/xkb.c @@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c index 854dde2212..32892ac207 100644 --- a/xkb/xkbAccessX.c +++ b/xkb/xkbAccessX.c @@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #if !defined(WIN32) #include diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c index bdfca425f8..f3e602ec4b 100644 --- a/xkb/xkbActions.c +++ b/xkb/xkbActions.c @@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/xkb/xkbEvents.c b/xkb/xkbEvents.c index e6325d875b..cfe9ba11c2 100644 --- a/xkb/xkbEvents.c +++ b/xkb/xkbEvents.c @@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c index a45fba6f66..4c12c24803 100644 --- a/xkb/xkbInit.c +++ b/xkb/xkbInit.c @@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include diff --git a/xkb/xkbLEDs.c b/xkb/xkbLEDs.c index 7ac6b1ad9d..7491235775 100644 --- a/xkb/xkbLEDs.c +++ b/xkb/xkbLEDs.c @@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/xkb/xkbPrKeyEv.c b/xkb/xkbPrKeyEv.c index 903534d54c..19dce29ab7 100644 --- a/xkb/xkbPrKeyEv.c +++ b/xkb/xkbPrKeyEv.c @@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/xkb/xkbSwap.c b/xkb/xkbSwap.c index efbdb81c11..6a178d7def 100644 --- a/xkb/xkbSwap.c +++ b/xkb/xkbSwap.c @@ -24,9 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include "stdio.h" #include diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c index 7ad50fc2f0..ff0785ddba 100644 --- a/xkb/xkbUtils.c +++ b/xkb/xkbUtils.c @@ -48,9 +48,7 @@ DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c index 47da228cab..146e366830 100644 --- a/xkb/xkbfmisc.c +++ b/xkb/xkbfmisc.c @@ -24,9 +24,7 @@ ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/xkb/xkbout.c b/xkb/xkbout.c index 297b3aa9c3..98130fc324 100644 --- a/xkb/xkbout.c +++ b/xkb/xkbout.c @@ -24,9 +24,7 @@ ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/xkb/xkbtext.c b/xkb/xkbtext.c index 35841dd2b1..c7ed48956e 100644 --- a/xkb/xkbtext.c +++ b/xkb/xkbtext.c @@ -24,9 +24,7 @@ ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include #include diff --git a/xkb/xkmread.c b/xkb/xkmread.c index def60def81..45da556608 100644 --- a/xkb/xkmread.c +++ b/xkb/xkmread.c @@ -24,9 +24,7 @@ ********************************************************/ -#ifdef HAVE_DIX_CONFIG_H #include -#endif #include