aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-04-30 16:21:56 +0000
committermarha <marha@users.sourceforge.net>2011-04-30 16:21:56 +0000
commite4dd9264ee8d4a20eef0eec8c8bf8cff2473b46f (patch)
tree1804d7456ba8f200c7e329d4e6aa67ce4fb1649f /include
parent88a78ebea08af461224f815a8380ea5c54186f43 (diff)
parent0402d388cb9803652c0f9a52ba7dcb6029fdd0b9 (diff)
downloadvcxsrv-e4dd9264ee8d4a20eef0eec8c8bf8cff2473b46f.tar.gz
vcxsrv-e4dd9264ee8d4a20eef0eec8c8bf8cff2473b46f.tar.bz2
vcxsrv-e4dd9264ee8d4a20eef0eec8c8bf8cff2473b46f.zip
svn merge ^/branches/released .
Diffstat (limited to 'include')
-rw-r--r--include/dix-config.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/include/dix-config.h b/include/dix-config.h
index f8fa95e36..c5018d630 100644
--- a/include/dix-config.h
+++ b/include/dix-config.h
@@ -35,9 +35,6 @@
/* Support Damage extension */
#define DAMAGE 1
-/* Build for darwin with Quartz support */
-#undef DARWIN_WITH_QUARTZ
-
/* Use OsVendorVErrorF */
#define DDXOSVERRORF 1
@@ -151,6 +148,9 @@
/* Define to 1 if you have the `m' library (-lm). */
#define HAVE_LIBM 1
+/* Define to 1 if you have the libdispatch (GCD) available */
+#undef HAVE_LIBDISPATCH
+
/* Define to 1 if you have the `link' function. */
#define HAVE_LINK 1
@@ -484,6 +484,9 @@
/* Define to 1 if you have the `ffs' function. */
#undef HAVE_FFS
+/* The compiler supported TLS storage class, prefering initial-exec if tls_model is supported */
+#undef TLS
+
/* Correctly set _XSERVER64 for OSX fat binaries */
#ifdef __APPLE__
#include "dix-config-apple-verbatim.h"