[Python-checkins] r42509 - in python/trunk: Misc/NEWS Modules/socketmodule.c

[georg.brandl]

Author: georg.brandl
Date: Mon Feb 20 10:42:33 2006
New Revision: 42509

Modified:
   python/trunk/Misc/NEWS
   python/trunk/Modules/socketmodule.c
Log:
Bug #854823: socketmodule now builds on Sun platforms even when
INET_ADDRSTRLEN is not defined.


Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Mon Feb 20 10:42:33 2006
@@ -224,6 +224,9 @@
 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.
 

Modified: python/trunk/Modules/socketmodule.c
==============================================================================
--- python/trunk/Modules/socketmodule.c	(original)
+++ python/trunk/Modules/socketmodule.c	Mon Feb 20 10:42:33 2006
@@ -215,8 +215,8 @@
 
 /* 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