From: Martin v. Löwis <martin@v.loewis.de>
Date: Thu, 12 Aug 2004 13:44:45 +0000 (+0000)
Subject: Define _BSD_TYPES. Fixes #1005308.
X-Git-Tag: v2.3.5c1~136
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0052fcdbbaaa79c765fe6cd70f09486ed72124e7;p=thirdparty%2FPython%2Fcpython.git

Define _BSD_TYPES. Fixes #1005308.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 6ae47d2e9aec..d47fc96f99c2 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 da89218cffcd..d6e73e3f94cb 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 a9ea12635e71..be90583d4b52 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 3eeede5f2bec..3f4425a42006 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