[Python-checkins] r67098 - in python/trunk: Misc/NEWS Modules/_multiprocessing/multiprocessing.h Modules/readline.c configure configure.in setup.py

Tue Nov 4 21:40:10 CET 2008

Author: martin.v.loewis
Date: Tue Nov 4 21:40:09 2008
New Revision: 67098
Log:
Issue #4204: Fixed module build errors on FreeBSD 4.
Modified:
 python/trunk/Misc/NEWS
 python/trunk/Modules/_multiprocessing/multiprocessing.h
 python/trunk/Modules/readline.c
 python/trunk/configure
 python/trunk/configure.in
 python/trunk/setup.py
Modified: python/trunk/Misc/NEWS
==============================================================================

--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Tue Nov 4 21:40:09 2008
@@ -63,6 +63,8 @@
 
 - Issue #3758: Add ``patchcheck`` build target to .PHONY.
 
+- Issue #4204: Fixed module build errors on FreeBSD 4.
+
 C-API
 -----
 
Modified: python/trunk/Modules/_multiprocessing/multiprocessing.h
==============================================================================
--- python/trunk/Modules/_multiprocessing/multiprocessing.h	(original)
+++ python/trunk/Modules/_multiprocessing/multiprocessing.h	Tue Nov 4 21:40:09 2008
@@ -20,7 +20,9 @@
 # define SEM_VALUE_MAX LONG_MAX
 #else
 # include <fcntl.h> /* O_CREAT and O_EXCL */
+# include <netinet/in.h>
 # include <sys/socket.h>
+# include <sys/uio.h>
 # include <arpa/inet.h> /* htonl() and ntohl() */
 # if HAVE_SEM_OPEN
 # include <semaphore.h>
Modified: python/trunk/Modules/readline.c
==============================================================================
--- python/trunk/Modules/readline.c	(original)
+++ python/trunk/Modules/readline.c	Tue Nov 4 21:40:09 2008
@@ -35,7 +35,11 @@
 #define completion_matches(x, y) \
 	rl_completion_matches((x), ((rl_compentry_func_t *)(y)))
 #else
+#if defined(_RL_FUNCTION_TYPEDEF)
 extern char **completion_matches(char *, rl_compentry_func_t *);
+#else
+extern char **completion_matches(char *, CPFunction *);
+#endif
 #endif
 
 static void
@@ -213,7 +217,11 @@
 	 default completion display. */
 	rl_completion_display_matches_hook =
 		completion_display_matches_hook ?
+#if defined(_RL_FUNCTION_TYPEDEF)
 		(rl_compdisp_func_t *)on_completion_display_matches_hook : 0;
+#else
+		(VFunction *)on_completion_display_matches_hook : 0;
+#endif
 #endif
 	return result;
 
Modified: python/trunk/configure
==============================================================================
--- python/trunk/configure	(original)
+++ python/trunk/configure	Tue Nov 4 21:40:09 2008
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 66295 .
+# From configure.in Revision: 66764 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 2.7.
 #
@@ -2105,11 +2105,18 @@
 # but used in struct sockaddr.sa_family. Reported by Tim Rice.
 SCO_SV/3.2)
 define_xopen_source=no;;
- # On FreeBSD 4.8 and MacOS X 10.2, a bug in ncurses.h means that
- # it craps out if _XOPEN_EXTENDED_SOURCE is defined. Apparently,
- # this is fixed in 10.3, which identifies itself as Darwin/7.*
- # This should hopefully be fixed in FreeBSD 4.9
- FreeBSD/4.8* | Darwin/6* )
+ # On FreeBSD 4, the math functions C89 does not cover are never defined
+ # with _XOPEN_SOURCE and __BSD_VISIBLE does not re-enable them.
+ FreeBSD/4.*)
+ define_xopen_source=no;;
+ # On MacOS X 10.2, a bug in ncurses.h means that it craps out if
+ # _XOPEN_EXTENDED_SOURCE is defined. Apparently, this is fixed in 10.3, which
+ # identifies itself as Darwin/7.*
+ # On Mac OS X 10.4, defining _POSIX_C_SOURCE or _XOPEN_SOURCE
+ # disables platform specific features beyond repair.
+ # On Mac OS X 10.3, defining _POSIX_C_SOURCE or _XOPEN_SOURCE
+ # has no effect, don't bother defining them
+ Darwin/[6789].*)
 define_xopen_source=no;;
 # On AIX 4 and 5.1, mbstate_t is defined only when _XOPEN_SOURCE == 500 but
 # used in wcsnrtombs() and mbsnrtowcs() even if _XOPEN_SOURCE is not defined
@@ -2121,13 +2128,6 @@
 define_xopen_source=no
 fi
 ;;
- # On Mac OS X 10.4, defining _POSIX_C_SOURCE or _XOPEN_SOURCE
- # disables platform specific features beyond repair.
- # On Mac OS X 10.3, defining _POSIX_C_SOURCE or _XOPEN_SOURCE
- # has no effect, don't bother defining them
- Darwin/[789].*)
- define_xopen_source=no
- ;;
 # On QNX 6.3.2, defining _XOPEN_SOURCE prevents netdb.h from
 # defining NI_NUMERICHOST.
 QNX/6.3.2)
Modified: python/trunk/configure.in
==============================================================================
--- python/trunk/configure.in	(original)
+++ python/trunk/configure.in	Tue Nov 4 21:40:09 2008
@@ -276,11 +276,18 @@
 # but used in struct sockaddr.sa_family. Reported by Tim Rice.
 SCO_SV/3.2)
 define_xopen_source=no;;
- # On FreeBSD 4.8 and MacOS X 10.2, a bug in ncurses.h means that
- # it craps out if _XOPEN_EXTENDED_SOURCE is defined. Apparently,
- # this is fixed in 10.3, which identifies itself as Darwin/7.*
- # This should hopefully be fixed in FreeBSD 4.9
- FreeBSD/4.8* | Darwin/6* )
+ # On FreeBSD 4, the math functions C89 does not cover are never defined
+ # with _XOPEN_SOURCE and __BSD_VISIBLE does not re-enable them.
+ FreeBSD/4.*)
+ define_xopen_source=no;;
+ # On MacOS X 10.2, a bug in ncurses.h means that it craps out if 
+ # _XOPEN_EXTENDED_SOURCE is defined. Apparently, this is fixed in 10.3, which
+ # identifies itself as Darwin/7.*
+ # On Mac OS X 10.4, defining _POSIX_C_SOURCE or _XOPEN_SOURCE
+ # disables platform specific features beyond repair.
+ # On Mac OS X 10.3, defining _POSIX_C_SOURCE or _XOPEN_SOURCE 
+ # has no effect, don't bother defining them
+ Darwin/@<:@6789@:>@.*)
 define_xopen_source=no;;
 # On AIX 4 and 5.1, mbstate_t is defined only when _XOPEN_SOURCE == 500 but
 # used in wcsnrtombs() and mbsnrtowcs() even if _XOPEN_SOURCE is not defined
@@ -292,13 +299,6 @@
 define_xopen_source=no
 fi
 ;;
- # On Mac OS X 10.4, defining _POSIX_C_SOURCE or _XOPEN_SOURCE
- # disables platform specific features beyond repair.
- # On Mac OS X 10.3, defining _POSIX_C_SOURCE or _XOPEN_SOURCE 
- # has no effect, don't bother defining them
- Darwin/@<:@789@:>@.*)
- define_xopen_source=no
- ;;
 # On QNX 6.3.2, defining _XOPEN_SOURCE prevents netdb.h from
 # defining NI_NUMERICHOST.
 QNX/6.3.2)
Modified: python/trunk/setup.py
==============================================================================
--- python/trunk/setup.py	(original)
+++ python/trunk/setup.py	Tue Nov 4 21:40:09 2008
@@ -1261,7 +1261,7 @@
 )
 libraries = []
 
- elif platform in ('freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'):
+ elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'):
 # FreeBSD's P1003.1b semaphore support is very experimental
 # and has many known problems. (as of June 2008)
 macros = dict( # FreeBSD
