[Python-checkins] r52098 - in python/branches/release24-maint: Lib/test/test_fcntl.py Lib/test/test_tempfile.py Misc/NEWS configure configure.in

[andrew.kuchling]

Author: andrew.kuchling
Date: Tue Oct  3 15:08:57 2006
New Revision: 52098

Modified:
   python/branches/release24-maint/Lib/test/test_fcntl.py
   python/branches/release24-maint/Lib/test/test_tempfile.py
   python/branches/release24-maint/Misc/NEWS
   python/branches/release24-maint/configure
   python/branches/release24-maint/configure.in
Log:
[Backport rev. 51728 by neal.norwitz]

Patch #1540470, for OpenBSD 4.0.  Backport candidate for 2.[34].



Modified: python/branches/release24-maint/Lib/test/test_fcntl.py
==============================================================================
--- python/branches/release24-maint/Lib/test/test_fcntl.py	(original)
+++ python/branches/release24-maint/Lib/test/test_fcntl.py	Tue Oct  3 15:08:57 2006
@@ -23,7 +23,7 @@
 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'

Modified: python/branches/release24-maint/Lib/test/test_tempfile.py
==============================================================================
--- python/branches/release24-maint/Lib/test/test_tempfile.py	(original)
+++ python/branches/release24-maint/Lib/test/test_tempfile.py	Tue Oct  3 15:08:57 2006
@@ -27,7 +27,7 @@
 # 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

Modified: python/branches/release24-maint/Misc/NEWS
==============================================================================
--- python/branches/release24-maint/Misc/NEWS	(original)
+++ python/branches/release24-maint/Misc/NEWS	Tue Oct  3 15:08:57 2006
@@ -218,7 +218,7 @@
 
 - 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.

Modified: python/branches/release24-maint/configure
==============================================================================
--- python/branches/release24-maint/configure	(original)
+++ python/branches/release24-maint/configure	Tue Oct  3 15:08:57 2006
@@ -1480,7 +1480,7 @@
   # 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.

Modified: python/branches/release24-maint/configure.in
==============================================================================
--- python/branches/release24-maint/configure.in	(original)
+++ python/branches/release24-maint/configure.in	Tue Oct  3 15:08:57 2006
@@ -140,7 +140,7 @@
   # 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.