summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--include/dix-config.h.in5
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 37dc51c31..43419a251 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2005-08-07 Keith Packard <keithp@keithp.com>
+ * include/dix-config.h.in:
+ Re-add _XOPEN_SOURCE as it's needed *sometimes*.
+ Place it in #ifndef to avoid whinging.
+
+2005-08-07 Keith Packard <keithp@keithp.com>
+
* .cvsignore:
* GL/mesa/X/.cvsignore:
* Xext/extmod/.cvsignore:
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index b6c537f14..2fcfc6671 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -371,6 +371,11 @@
/* POSIX-compliant source */
#undef _POSIX_SOURCE
+#ifndef _XOPEN_SOURCE
+/* X/Open-compliant source */
+#undef _XOPEN_SOURCE
+#endif
+
/* Define to empty if `const' does not conform to ANSI C. */
#undef const