Bug #854823: socketmodule now builds on Sun platforms even when

INET_ADDRSTRLEN is not defined.

diff --git a/Misc/NEWS b/Misc/NEWS
index ff76eb672afdde31dcb6400de03e636e43c8d136..3721a727395bb089e329c80fc0b0fc249f8aa3c9 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -45,6 +45,9 @@ Core and builtins
 Extension Modules
 -----------------
 
+- Bug #854823: socketmodule now builds on Sun platforms even when
+  INET_ADDRSTRLEN is not defined.
+
 - Bug #876637, prevent stack corruption when socket descriptor
   is larger than FD_SETSIZE.
 

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 0efa9479405d51caa0757639d0d242d236388a37..a5d2bf3c437bf15649e60c9d6d3f18f598da8bd8 100644 (file)
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -210,8 +210,8 @@ shutdown(how) -- shut down traffic in one or both directions\n\
 
 /* 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)
+   are just busted. Same thing for Solaris. */
+#if (defined(__sgi) || defined(sun)) && !defined(INET_ADDRSTRLEN)
 #define INET_ADDRSTRLEN 16
 #endif