Add necessary *CONFIG_H declarations and a force-off of XF86* extensions in

miinitext in the XGL case. Prevents mismatched structure sizes on my
    _XSERVER64 machine. At this point, with the uncommitted render/ diffs,
    Xglx starts up but displays badly.
This commit is contained in:
Eric Anholt 2005-12-29 00:19:33 +00:00
commit d6646307f0
5 changed files with 24 additions and 22 deletions

View file

@ -1,4 +1,4 @@
/* $XdotOrg: xserver/xorg/mi/miinitext.c,v 1.26 2005/07/16 03:49:59 kem Exp $ */
/* $XdotOrg: xserver/xorg/mi/miinitext.c,v 1.27 2005/12/28 10:02:53 ajax Exp $ */
/* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.67 2003/01/12 02:44:27 dawes Exp $ */
/***********************************************************
@ -74,6 +74,14 @@ SOFTWARE.
#undef XF86VIDMODE
#endif
#ifdef HAVE_XGL_CONFIG_H
#include <xgl-config.h>
#undef XF86MISC
#undef XFreeXDGA
#undef XF86DRI
#undef XF86VIDMODE
#endif
#include "misc.h"
#include "extension.h"
#include "micmap.h"