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

INET_ADDRSTRLEN is not defined.

diff --git a/Misc/NEWS b/Misc/NEWS
index 28895c4a1d40e67d6bae67b76b32e0a5883149ce..8429b7be742df85d48fc34d4cd67e69dc56e9678 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -224,6 +224,9 @@ Core and builtins
 Extension Modules
 -----------------
 
+- Bug #854823: socketmodule now builds on Sun platforms even when
+  INET_ADDRSTRLEN is not defined.
+
 - Patch #1393157: os.startfile() now has an optional argument to specify
   a "command verb" to invoke on the file.
 

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index a44558156568b6c8edc35358987f8b0926b3fd37..7368eb4ee7049f38473b9fbb3680d8a89563c356 100644 (file)
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -215,8 +215,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