diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-12-28 10:02:54 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-12-28 10:02:54 +0000 |
| commit | 05c139d4cdfd11d39c0168d0c80ac1dbdd069b4c (patch) | |
| tree | e449db85c8686fc8fdc5bd01abf06cbf04d1b5f1 /mi | |
| parent | aeb770f645e2d591b255ec4ab06addcb1beafa5f (diff) | |
Enough build fixes to get {sdl,ephyr,fake} to link.
Diffstat (limited to 'mi')
| -rw-r--r-- | mi/miinitext.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/mi/miinitext.c b/mi/miinitext.c index d2c68e18a..18f3a38ce 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/mi/miinitext.c,v 1.20 2005/05/19 18:53:50 ajax Exp $ */ +/* $XdotOrg: xserver/xorg/mi/miinitext.c,v 1.26 2005/07/16 03:49:59 kem Exp $ */ /* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.67 2003/01/12 02:44:27 dawes Exp $ */ /*********************************************************** @@ -65,6 +65,15 @@ SOFTWARE. #undef DPMSExtension #endif +#ifdef HAVE_KDRIVE_CONFIG_H +#include <kdrive-config.h> +/* there must be a better way... */ +#undef XF86MISC +#undef XFreeXDGA +#undef XF86DRI +#undef XF86VIDMODE +#endif + #include "misc.h" #include "extension.h" #include "micmap.h" |