summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnthony Baxter <anthonybaxter@gmail.com>2003-10-04 08:00:49 (GMT)
committerAnthony Baxter <anthonybaxter@gmail.com>2003-10-04 08:00:49 (GMT)
commitbab23cfc26c5f9b74428eb48df80c09e5dfe361f (patch)
tree54abc1aece623fbb1c246aa7dae08d591569a146
parent6169c6bc1d27441f95fbab71ea504c8c01cc0fa9 (diff)
downloadcpython-bab23cfc26c5f9b74428eb48df80c09e5dfe361f.zip
cpython-bab23cfc26c5f9b74428eb48df80c09e5dfe361f.tar.gz
cpython-bab23cfc26c5f9b74428eb48df80c09e5dfe361f.tar.bz2
made the SGI INET_ADDRSTRLEN define apply for any compiler on Irix. Both the
SGI compiler and GCC seem to need this.
-rw-r--r--Modules/socketmodule.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 8fd5963..a2a692ad 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -194,14 +194,17 @@ shutdown(how) -- shut down traffic in one or both directions\n\
but I don't know what the right thing is. */
#define _SGIAPI 1
-#ifndef ENABLE_IPV6
-#define INET_ADDRSTRLEN 16
-#endif
-
#define HAVE_INET_PTON
#include <netdb.h>
#endif
+/* Irix 6.5 fails to define this variable at all. This is needed
+ for both GCC and SGI's compiler. I'd say that the SGI headers
+ are just busted. */
+#if defined(__sgi) && !defined(INET_ADDRSTRLEN)
+#define INET_ADDRSTRLEN 16
+#endif
+
/* Generic includes */
#include <sys/types.h>
#include <signal.h>