aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/include
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-04-22 08:57:22 +0000
committermarha <marha@users.sourceforge.net>2010-04-22 08:57:22 +0000
commitd2bf55b405ea8f980984aab4be7d4b878c9e6981 (patch)
tree676ad441e287f6de1950260c3d2ef0b720f69bad /xorg-server/include
parenta46e26df6103fb0e6e00d8d11d58c3f7a358208c (diff)
downloadvcxsrv-d2bf55b405ea8f980984aab4be7d4b878c9e6981.tar.gz
vcxsrv-d2bf55b405ea8f980984aab4be7d4b878c9e6981.tar.bz2
vcxsrv-d2bf55b405ea8f980984aab4be7d4b878c9e6981.zip
git update 22/4/2010
Diffstat (limited to 'xorg-server/include')
-rw-r--r--xorg-server/include/cursor.h2
-rw-r--r--xorg-server/include/dix-config.h.in6
-rw-r--r--xorg-server/include/globals.h6
3 files changed, 0 insertions, 14 deletions
diff --git a/xorg-server/include/cursor.h b/xorg-server/include/cursor.h
index acc95c3b3..dadedfd1d 100644
--- a/xorg-server/include/cursor.h
+++ b/xorg-server/include/cursor.h
@@ -55,9 +55,7 @@ SOFTWARE.
#define NullCursor ((CursorPtr)NULL)
/* Provide support for alpha composited cursors */
-#ifdef RENDER
#define ARGB_CURSOR
-#endif
struct _DeviceIntRec;
diff --git a/xorg-server/include/dix-config.h.in b/xorg-server/include/dix-config.h.in
index 058c8fd14..7759aac6a 100644
--- a/xorg-server/include/dix-config.h.in
+++ b/xorg-server/include/dix-config.h.in
@@ -360,9 +360,6 @@
/* Support Xv extension */
#undef XV
-/* Build Multibuffer extension */
-#undef MULTIBUFFER
-
/* Support DRI extension */
#undef XF86DRI
@@ -411,9 +408,6 @@
/* Support HAL for hotplug */
#undef CONFIG_HAL
-/* Use only built-in fonts */
-#undef BUILTIN_FONTS
-
/* Have a monotonic clock from clock_gettime() */
#undef MONOTONIC_CLOCK
diff --git a/xorg-server/include/globals.h b/xorg-server/include/globals.h
index 52c19a490..6959fc71a 100644
--- a/xorg-server/include/globals.h
+++ b/xorg-server/include/globals.h
@@ -69,17 +69,11 @@ extern _X_EXPORT Bool noScreenSaverExtension;
extern _X_EXPORT Bool noMITShmExtension;
#endif
-#ifdef MULTIBUFFER
-extern _X_EXPORT Bool noMultibufferExtension;
-#endif
-
#ifdef RANDR
extern _X_EXPORT Bool noRRExtension;
#endif
-#ifdef RENDER
extern _X_EXPORT Bool noRenderExtension;
-#endif
#ifdef XCSECURITY
extern _X_EXPORT Bool noSecurityExtension;