diff options
| author | Eric Anholt <anholt@freebsd.org> | 2005-12-29 00:19:33 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2005-12-29 00:19:33 +0000 |
| commit | d6646307f063b938c44d6193a2e8872e178aa90f (patch) | |
| tree | eb68d88a6ca52d844aeb10d160eb96ff61569fa5 /mi/miinitext.c | |
| parent | 3664c3ebf348d07ae3fe301fb8720adf32cf6d64 (diff) | |
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.
Diffstat (limited to 'mi/miinitext.c')
| -rw-r--r-- | mi/miinitext.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/mi/miinitext.c b/mi/miinitext.c index 18f3a38ce..44e4508fa 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -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" |