From 2446c474aae15bcaf31e4b799f94f21d515984d5 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Thu, 22 Apr 2010 13:02:12 +0000
Subject: svn merge -r541:HEAD "^/branches/released" .

---
 xorg-server/include/cursor.h        | 2 --
 xorg-server/include/dix-config.h.in | 6 ------
 xorg-server/include/globals.h       | 6 ------
 3 files changed, 14 deletions(-)

(limited to 'xorg-server/include')

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 6aadb8bdf..9c804ee52 100644
--- a/xorg-server/include/globals.h
+++ b/xorg-server/include/globals.h
@@ -67,17 +67,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;
-- 
cgit v1.2.3