diff options
author | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
commit | 2553bdd7c359cd87525d367761c86932cec5adff (patch) | |
tree | ae71245933c98474a699d3e392de5820879b2018 /xorg-server/include/xorg-server.h.in | |
parent | e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (diff) | |
parent | 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff) | |
download | vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.gz vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.bz2 vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.zip |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/include/xorg-server.h.in')
-rw-r--r-- | xorg-server/include/xorg-server.h.in | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/xorg-server/include/xorg-server.h.in b/xorg-server/include/xorg-server.h.in index 1d41b4ce6..4cf1bbf0e 100644 --- a/xorg-server/include/xorg-server.h.in +++ b/xorg-server/include/xorg-server.h.in @@ -25,18 +25,12 @@ /* Support Composite Extension */ #undef COMPOSITE -/* Use OsVendorInit */ -#undef DDXOSINIT - /* Build DPMS extension */ #undef DPMSExtension /* Build GLX extension */ #undef GLXEXT -/* Include handhelds.org h3600 touchscreen driver */ -#undef H3600_TS - /* Support XDM-AUTH*-1 */ #undef HASXDMAUTH @@ -46,21 +40,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 - -/* Need XFree86 typedefs */ -#undef NEED_XF86_TYPES - /* Internal define for Xinerama */ #undef PANORAMIX @@ -76,15 +58,9 @@ /* Support MIT-SCREEN-SAVER extension */ #undef SCREENSAVER -/* Use a lock to prevent multiple servers on a display */ -#undef SERVER_LOCK - /* Support SHAPE extension */ #undef SHAPE -/* Include time-based scheduler */ -#undef SMART_SCHEDULE - /* Define to 1 on systems derived from System V Release 4 */ #undef SVR4 @@ -112,9 +88,6 @@ /* Build XFree86 BigFont extension */ #undef XF86BIGFONT -/* Support XFree86 miscellaneous extensions */ -#undef XF86MISC - /* Support XFree86 Video Mode extension */ #undef XF86VIDMODE @@ -160,37 +133,18 @@ /* Build XvMC Extension */ #undef XvMCExtension -/* Build XRes extension */ -#undef XResExtension - /* Support XSync extension */ #undef XSYNC /* Support XTest extension */ #undef XTEST -/* Support XTrap extension */ -#undef XTRAP - /* Support Xv Extension */ #undef XV /* Vendor name */ #undef XVENDORNAME -/* Endian order */ -#undef _X_BYTE_ORDER -/* Deal with multiple architecture compiles on Mac OS X */ -#ifndef __APPLE_CC__ -#define X_BYTE_ORDER _X_BYTE_ORDER -#else -#ifdef __BIG_ENDIAN__ -#define X_BYTE_ORDER X_BIG_ENDIAN -#else -#define X_BYTE_ORDER X_LITTLE_ENDIAN -#endif -#endif - /* BSD-compliant source */ #undef _BSD_SOURCE |