aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/include/dix-config.h.in
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-04-22 13:02:12 +0000
committermarha <marha@users.sourceforge.net>2010-04-22 13:02:12 +0000
commit2446c474aae15bcaf31e4b799f94f21d515984d5 (patch)
tree31c649543787afa72f5908dedf07ec8ae37a84a2 /xorg-server/include/dix-config.h.in
parent0b44ee3fb92120190fa46e73b7abfbaa8a0adaec (diff)
downloadvcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.tar.gz
vcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.tar.bz2
vcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.zip
svn merge -r541:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/include/dix-config.h.in')
-rw-r--r--xorg-server/include/dix-config.h.in6
1 files changed, 0 insertions, 6 deletions
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