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 c3245b8..1ec726d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -366,7 +366,7 @@
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 bae822b..5253b86 100755
--- 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 @@
# 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 @@
_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 3d3d4a1..f5d0342 100644
--- a/configure.in
+++ b/configure.in
@@ -276,14 +276,16 @@
# 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