diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b3f6fc5df0a..30802c12d43 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-30  Joel Brobecker  <brobecker@adacore.com>
+
+	* python/python-internal.h (_XOPEN_SOURCE): Undefine before
+	including Python.h.
+
 2010-06-29  Doug Evans  <dje@google.com>
 
 	PR gdb/11702
diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h
index daaed2cc574..630d191df67 100644
--- a/gdb/python/python-internal.h
+++ b/gdb/python/python-internal.h
@@ -30,8 +30,11 @@
    if it sees _GNU_SOURCE (which config.h will define).
    pyconfig.h defines _POSIX_C_SOURCE to a different value than
    /usr/include/features.h does causing compilation to fail.
-   To work around this, undef _POSIX_C_SOURCE before we include Python.h.  */
+   To work around this, undef _POSIX_C_SOURCE before we include Python.h.
+
+   Same problem with _XOPEN_SOURCE.  */
 #undef _POSIX_C_SOURCE
+#undef _XOPEN_SOURCE
 
 #if HAVE_LIBPYTHON2_4
 #include "python2.4/Python.h"