diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/dix-config.h.in | 15 | ||||
| -rw-r--r-- | include/dixstruct.h | 4 | ||||
| -rw-r--r-- | include/globals.h | 16 | ||||
| -rw-r--r-- | include/servermd.h | 2 | ||||
| -rw-r--r-- | include/windowstr.h | 3 | ||||
| -rw-r--r-- | include/xorg-server.h.in | 6 |
6 files changed, 5 insertions, 41 deletions
diff --git a/include/dix-config.h.in b/include/dix-config.h.in index 38639d684..177908265 100644 --- a/include/dix-config.h.in +++ b/include/dix-config.h.in @@ -258,15 +258,9 @@ /* Support os-specific local connections */ #undef LOCALCONN -/* Support MIT Misc extension */ -#undef MITMISC - /* Support MIT-SHM Extension */ #undef MITSHM -/* Disable some debugging code */ -#undef NDEBUG - /* Enable some debugging code */ #undef DEBUG @@ -419,15 +413,6 @@ /* Support Xv extension */ #undef XV -/* Build APPGROUP extension */ -#undef XAPPGROUP - -/* Build TOG-CUP extension */ -#undef TOGCUP - -/* Build Extended-Visual-Information extension */ -#undef EVI - /* Build Multibuffer extension */ #undef MULTIBUFFER diff --git a/include/dixstruct.h b/include/dixstruct.h index ae144cf73..306870c9b 100644 --- a/include/dixstruct.h +++ b/include/dixstruct.h @@ -125,9 +125,7 @@ typedef struct _Client { int requestLogIndex; #endif unsigned long replyBytesRemaining; -#ifdef XAPPGROUP - struct _AppGroupRec* appgroup; -#endif + void *appgroup; /* Can't remove, ABI */ struct _FontResolution * (*fontResFunc) ( /* no need for font.h */ ClientPtr /* pClient */, int * /* num */); diff --git a/include/globals.h b/include/globals.h index 2ca9531d9..9e5060d5f 100644 --- a/include/globals.h +++ b/include/globals.h @@ -66,10 +66,6 @@ extern Bool noDbeExtension; extern Bool noDPMSExtension; #endif -#ifdef EVI -extern Bool noEVIExtension; -#endif - #ifdef FONTCACHE extern Bool noFontCacheExtension; #endif @@ -86,10 +82,6 @@ extern Bool noScreenSaverExtension; extern Bool noMITShmExtension; #endif -#ifdef MITMISC -extern Bool noMITMiscExtension; -#endif - #ifdef MULTIBUFFER extern Bool noMultibufferExtension; #endif @@ -114,18 +106,10 @@ extern Bool noSecurityExtension; extern Bool noSyncExtension; #endif -#ifdef TOGCUP -extern Bool noXcupExtension; -#endif - #ifdef RES extern Bool noResExtension; #endif -#ifdef XAPPGROUP -extern Bool noXagExtension; -#endif - #ifdef XCMISC extern Bool noXCMiscExtension; #endif diff --git a/include/servermd.h b/include/servermd.h index 2f511dabe..616841089 100644 --- a/include/servermd.h +++ b/include/servermd.h @@ -393,7 +393,7 @@ SOFTWARE. #endif /* ia64 */ -#if defined(__amd64__) || defined(amd64) || defined(__amd64) +#if defined(__amd64__) || defined(amd64) || defined(__amd64) || defined(__x86_64__) # define IMAGE_BYTE_ORDER LSBFirst # if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO) diff --git a/include/windowstr.h b/include/windowstr.h index a36dc2972..a895a8805 100644 --- a/include/windowstr.h +++ b/include/windowstr.h @@ -189,6 +189,9 @@ typedef struct _Window { unsigned forcedBS:1; /* system-supplied backingStore */ unsigned redirectDraw:2; /* COMPOSITE rendering redirect */ unsigned forcedBG:1; /* must have an opaque background */ +#ifdef ROOTLESS + unsigned rootlessUnhittable:1; /* doesn't hit-test */ +#endif } WindowRec; /* diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in index 1d41b4ce6..5a253c7c6 100644 --- a/include/xorg-server.h.in +++ b/include/xorg-server.h.in @@ -46,15 +46,9 @@ /* Support IPv6 for TCP connections */ #undef IPv6 -/* Support MIT Misc extension */ -#undef MITMISC - /* Support MIT-SHM Extension */ #undef MITSHM -/* Disable some debugging code */ -#undef NDEBUG - /* Need XFree86 helper functions */ #undef NEED_XF86_PROTOTYPES |