summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2006-09-05 02:57:01 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2006-09-05 02:57:01 (GMT)
commit4bc2c0919b2ed31851e9c3423ab85614fe35a75a (patch)
tree2cb80a998fc4fd5b86cbff36741781d208e2a678
parentd34e4272e0e82dcbf21fc6378c393bca7db0dfd7 (diff)
downloadcpython-4bc2c0919b2ed31851e9c3423ab85614fe35a75a.zip
cpython-4bc2c0919b2ed31851e9c3423ab85614fe35a75a.tar.gz
cpython-4bc2c0919b2ed31851e9c3423ab85614fe35a75a.tar.bz2
Patch #1540470, for OpenBSD 4.0. Backport candidate for 2.[34].
-rwxr-xr-xLib/test/test_fcntl.py2
-rw-r--r--Lib/test/test_tempfile.py2
-rw-r--r--Misc/NEWS2
-rwxr-xr-xconfigure2
-rw-r--r--configure.in2
5 files changed, 6 insertions, 4 deletions
diff --git a/Lib/test/test_fcntl.py b/Lib/test/test_fcntl.py
index 58a57b5..2d800b2 100755
--- a/Lib/test/test_fcntl.py
+++ b/Lib/test/test_fcntl.py
@@ -25,7 +25,7 @@ if sys.platform in ('netbsd1', 'netbsd2', 'netbsd3',
'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
'freebsd6', 'freebsd7',
'bsdos2', 'bsdos3', 'bsdos4',
- 'openbsd', 'openbsd2', 'openbsd3'):
+ 'openbsd', 'openbsd2', 'openbsd3', 'openbsd4'):
if struct.calcsize('l') == 8:
off_t = 'l'
pid_t = 'i'
diff --git a/Lib/test/test_tempfile.py b/Lib/test/test_tempfile.py
index aeaa77e..2047a63 100644
--- a/Lib/test/test_tempfile.py
+++ b/Lib/test/test_tempfile.py
@@ -27,7 +27,7 @@ has_spawnl = hasattr(os, 'spawnl')
# number of files that can be opened at one time (see ulimit -n)
if sys.platform == 'mac':
TEST_FILES = 32
-elif sys.platform == 'openbsd3':
+elif sys.platform in ('openbsd3', 'openbsd4'):
TEST_FILES = 48
else:
TEST_FILES = 100
diff --git a/Misc/NEWS b/Misc/NEWS
index eab647e..880659b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -59,6 +59,8 @@ Documentation
Build
-----
+- Patch #1540470, for OpenBSD 4.0.
+
C API
-----
diff --git a/configure b/configure
index 5bbccce..b96349a 100755
--- a/configure
+++ b/configure
@@ -1553,7 +1553,7 @@ 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/2.* | OpenBSD/3.[0123456789] | OpenBSD/4.[0])
define_xopen_source=no;;
# On Solaris 2.6, sys/wait.h is inconsistent in the usage
# of union __?sigval. Reported by Stuart Bishop.
diff --git a/configure.in b/configure.in
index 56212a7..cff7194 100644
--- a/configure.in
+++ b/configure.in
@@ -201,7 +201,7 @@ 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/2.* | OpenBSD/3.@<:@0123456789@:>@ | OpenBSD/4.@<:@0@:>@)
define_xopen_source=no;;
# On Solaris 2.6, sys/wait.h is inconsistent in the usage
# of union __?sigval. Reported by Stuart Bishop.