andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix inclusion order of dix-config.h, so _XSERVER64 gets defined before X.h

Browse Source 
or Xdefs.h get included. (Jürg Billeter)
This commit is contained in:
Daniel Stone 2005-08-21 19:29:55 +00:00
parent 8d6e743bc4
commit 79be1f6d4d
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mi/midispcur.c
View File

@ -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"

7
mi/mipointer.c
View File

@ -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

7
mi/misprite.c
View File

@ -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"