From 9569ea3425d63f0318f476ed8d3f835c517dd2bc Mon Sep 17 00:00:00 2001 From: "Andrew M. Kuchling" Date: Tue, 3 Oct 2006 13:08:57 +0000 Subject: [PATCH] [Backport rev. 51728 by neal.norwitz] Patch #1540470, for OpenBSD 4.0. Backport candidate for 2.[34]. --- Lib/test/test_fcntl.py | 2 +- Lib/test/test_tempfile.py | 2 +- Misc/NEWS | 2 +- configure | 2 +- configure.in | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Lib/test/test_fcntl.py b/Lib/test/test_fcntl.py index 8835ea3f5866..1427f67bb299 100755 --- a/Lib/test/test_fcntl.py +++ b/Lib/test/test_fcntl.py @@ -23,7 +23,7 @@ if sys.platform.startswith('atheos'): if sys.platform in ('netbsd1', 'netbsd2', 'Darwin1.2', 'darwin', 'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5', 'freebsd6', '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 d5ae5de86f05..e6932cd4450a 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 fb20fa43a5dc..bc48b007b2d6 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -218,7 +218,7 @@ Build - Bug #1502728: Correctly link against librt library on HP-UX. -- OpenBSD 3.9 is now supported. +- OpenBSD 3.9 and 4.0 are now supported. - Test for sys/statvfs.h before including it, as statvfs is present on some OSX installation, but its header file is not. diff --git a/configure b/configure index 5bc56dcd718a..4f25e0941d0a 100755 --- a/configure +++ b/configure @@ -1480,7 +1480,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 45af720e9f86..f66f43db2fc8 100644 --- a/configure.in +++ b/configure.in @@ -140,7 +140,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. -- 2.47.3