summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2004-08-12 13:44:45 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2004-08-12 13:44:45 (GMT)
commit0052fcdbbaaa79c765fe6cd70f09486ed72124e7 (patch)
treea74ad4d603f84b4ed944bc0970a1321bf660539b
parentea64250f15cd1012af7b613f04f7de6de06d0b9a (diff)
downloadcpython-0052fcdbbaaa79c765fe6cd70f09486ed72124e7.zip
cpython-0052fcdbbaaa79c765fe6cd70f09486ed72124e7.tar.gz
cpython-0052fcdbbaaa79c765fe6cd70f09486ed72124e7.tar.bz2
Define _BSD_TYPES. Fixes #1005308.
-rw-r--r--Misc/NEWS2
-rwxr-xr-xconfigure10
-rw-r--r--configure.in4
-rw-r--r--pyconfig.h.in3
4 files changed, 18 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 6ae47d2..d47fc96 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -28,6 +28,8 @@ Core and builtins
Extension modules
-----------------
+- Bug #1005308: Define _BSD_TYPES.
+
- Patch #1005568: Use _SC_PAGESIZE on Irix in resourcemoudle.
- Patch #924294: Do no check for AF_INET6 if it is not defined.
diff --git a/configure b/configure
index da89218..d6e73e3f 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 1.427.4.12 .
+# From configure.in Revision: 1.427.4.13 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.57 for python 2.3.
#
@@ -1349,6 +1349,14 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
+# The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
+# u_int on Irix 5.3. Defining _BSD_TYPES brings it back.
+
+cat >>confdefs.h <<\_ACEOF
+#define _BSD_TYPES 1
+_ACEOF
+
+
define_xopen_source=yes
# Arguments passed to configure.
diff --git a/configure.in b/configure.in
index a9ea126..be90583 100644
--- a/configure.in
+++ b/configure.in
@@ -50,6 +50,10 @@ AC_DEFINE(_NETBSD_SOURCE, 1, [Define on NetBSD to activate all library features]
# them.
AC_DEFINE(__BSD_VISIBLE, 1, [Define on FreeBSD to activate all library features])
+# The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
+# u_int on Irix 5.3. Defining _BSD_TYPES brings it back.
+AC_DEFINE(_BSD_TYPES, 1, [Define on Irix to enable u_int])
+
define_xopen_source=yes
# Arguments passed to configure.
diff --git a/pyconfig.h.in b/pyconfig.h.in
index 3eeede5..3f4425a 100644
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -823,6 +823,9 @@
# undef _ALL_SOURCE
#endif
+/* Define on Irix to enable u_int */
+#undef _BSD_TYPES
+
/* This must be set to 64 on some systems to enable large file support. */
#undef _FILE_OFFSET_BITS