diff options
author | Daniel Stone <daniel@fooishbar.org> | 2005-08-21 19:29:55 +0000 |
---|---|---|
committer | Daniel Stone <daniel@fooishbar.org> | 2005-08-21 19:29:55 +0000 |
commit | 79be1f6d4d1ab48841d31d5553dd36b1b3632650 (patch) | |
tree | 0122585136aed85792bddfc3950b9273ef32f3d4 /mi | |
parent | 8d6e743bc4e6854ee0bb0fa4f197acd6d7683ccd (diff) |
Fix inclusion order of dix-config.h, so _XSERVER64 gets defined before X.h
or Xdefs.h get included. (Jürg Billeter)
Diffstat (limited to 'mi')
-rw-r--r-- | mi/midispcur.c | 7 | ||||
-rw-r--r-- | mi/mipointer.c | 7 | ||||
-rw-r--r-- | mi/misprite.c | 7 |
3 files changed, 12 insertions, 9 deletions
diff --git a/mi/midispcur.c b/mi/midispcur.c index 007ae2519..080ac1c59 100644 --- a/mi/midispcur.c +++ b/mi/midispcur.c @@ -32,6 +32,10 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/programs/Xserver/mi/midispcur.c,v 1.9 2002/12/09 04:10:57 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #define NEED_EVENTS # include <X11/X.h> # include "misc.h" @@ -45,9 +49,6 @@ in this Software without prior written authorization from The Open Group. # include "mipointer.h" # include "misprite.h" # include "gcstruct.h" -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif #ifdef ARGB_CURSOR # include "picturestr.h" diff --git a/mi/mipointer.c b/mi/mipointer.c index db6f8bce9..432cc1606 100644 --- a/mi/mipointer.c +++ b/mi/mipointer.c @@ -30,6 +30,10 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/programs/Xserver/mi/mipointer.c,v 3.9 2001/09/04 14:03:28 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + # define NEED_EVENTS # include <X11/X.h> # include <X11/Xmd.h> @@ -527,9 +531,6 @@ _miRegisterPointerDevice (pScreen, pDevice) } /* obsolete: for binary compatibility */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif #ifdef miRegisterPointerDevice #undef miRegisterPointerDevice diff --git a/mi/misprite.c b/mi/misprite.c index 6c1ed1bb3..b76542774 100644 --- a/mi/misprite.c +++ b/mi/misprite.c @@ -32,6 +32,10 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/programs/Xserver/mi/misprite.c,v 3.10tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + # include <X11/X.h> # include <X11/Xproto.h> # include "misc.h" @@ -48,9 +52,6 @@ in this Software without prior written authorization from The Open Group. # include "mispritest.h" # include "dixfontstr.h" # include <X11/fonts/fontstruct.h> -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif #ifdef RENDER # include "mipict.h" |