about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Src/system.h9
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 51d3e0614..319d8eb62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-04-23  Peter Stephenson  <pws@csr.com>
 
+	* 24867: Src/system.h: looks like we need _XOPEN_SOURCE_EXTENDED
+	instead of just _XOPEN_SOURCE.
+
 	* 24865: Src/zle_vi.c: bad character adjustment in
 	vireplacechars().
 
diff --git a/Src/system.h b/Src/system.h
index a10b66fd8..2f542981b 100644
--- a/Src/system.h
+++ b/Src/system.h
@@ -56,8 +56,13 @@
 # define _XOPEN_SOURCE_EXTENDED 1
 #else
 # ifdef MULTIBYTE_SUPPORT
-/* Needed for wcwidth() which is part of XSI */
-#  define _XOPEN_SOURCE 1
+/*
+ * Needed for wcwidth() which is part of XSI.
+ * Various other uses of the interface mean we can't get away with just
+ * _XOPEN_SOURCE.
+ */
+/*#  define _XOPEN_SOURCE 1*/
+#  define _XOPEN_SOURCE_EXTENDED 1
 # endif
 #endif