Merged revisions 78204 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78204 | martin.v.loewis | 2010-02-15 22:45:06 +0100 (Mo, 15 Feb 2010) | 9 lines

  Merged revisions 78202 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r78202 | martin.v.loewis | 2010-02-15 22:41:12 +0100 (Mo, 15 Feb 2010) | 2 lines

    Issue #7903: Define _BSD_SOURCE through OpenBSD 4.9.
  ........
................

diff --git a/Misc/NEWS b/Misc/NEWS
index c3245b8c6be168fc35be51b061cf29e132302b3d..1ec726dbf47d6cb4fc92d0fce16f20015d60ab81 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -366,7 +366,7 @@ C-API
 Build
 -----
 
-- Issue #3920: Define _BSD_SOURCE on OpenBSD 4.4.
+- Issue #3920, #7903: Define _BSD_SOURCE on OpenBSD 4.4 through 4.9.
 
 - Issue #7632: When Py_USING_MEMORY_DEBUGGER is defined, disable the
   private memory allocation scheme in dtoa.c and use PyMem_Malloc and

diff --git a/configure b/configure
index bae822ba6f995e98175b5bc7928173cea8a09d69..5253b8614103dcdd99846f225ded777caa08b46f 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 78157 .
+# From configure.in Revision: 78197 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 3.1.
 #
@@ -2106,7 +2106,9 @@ case $ac_sys_system/$ac_sys_release in
   # On OpenBSD, select(2) is not available if _XOPEN_SOURCE is defined,
   # even though select is a POSIX function. Reported by J. Ribbens.
   # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
-  OpenBSD/2.* | OpenBSD/3.[0123456789] | OpenBSD/4.[0123])
+  # In addition, Stefan Krah confirms that issue #1244610 exists through
+  # OpenBSD 4.6, but is fixed in 4.7.
+  OpenBSD/2.* | OpenBSD/3.[0123456789] | OpenBSD/4.[0123456])
     define_xopen_source=no
     # OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is
     # also defined. This can be overridden by defining _BSD_SOURCE
@@ -2117,7 +2119,7 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
     ;;
-  OpenBSD/4.[4])
+  OpenBSD/4.[789])
     # OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is
     # also defined. This can be overridden by defining _BSD_SOURCE
     # As this has a different meaning on Linux, only define it on OpenBSD

diff --git a/configure.in b/configure.in
index 3d3d4a17cd473f21f1c159a53bc06e94e1cc9dd5..f5d03427f7d9e4e504c7b3cc3095e42cd90a51d3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -276,14 +276,16 @@ case $ac_sys_system/$ac_sys_release in
   # On OpenBSD, select(2) is not available if _XOPEN_SOURCE is defined,
   # even though select is a POSIX function. Reported by J. Ribbens.
   # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
-  OpenBSD/2.* | OpenBSD/3.@<:@0123456789@:>@ | OpenBSD/4.@<:@0123@:>@) 
+  # In addition, Stefan Krah confirms that issue #1244610 exists through
+  # OpenBSD 4.6, but is fixed in 4.7.
+  OpenBSD/2.* | OpenBSD/3.@<:@0123456789@:>@ | OpenBSD/4.@<:@0123456@:>@) 
     define_xopen_source=no
     # OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is
     # also defined. This can be overridden by defining _BSD_SOURCE
     # As this has a different meaning on Linux, only define it on OpenBSD
     AC_DEFINE(_BSD_SOURCE, 1, [Define on OpenBSD to activate all library features])
     ;;
-  OpenBSD/4.@<:@4@:>@)
+  OpenBSD/4.@<:@789@:>@)
     # OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is
     # also defined. This can be overridden by defining _BSD_SOURCE
     # As this has a different meaning on Linux, only define it on OpenBSD