Test for __sun instead of __sun__, since SUNWspro only defines the latter;

gcc defines both.

diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index a56a67c4af277189b65ab41dfa05bfd8af09d52d..6f79aa02d3093ad0192cbb6e72b45a63948a1fbc 100644 (file)
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -118,7 +118,7 @@ extern int setupterm(char *,int,int *);
 #include <term.h>
 #endif
 
-#if defined(sgi) || defined(__sun__)
+#if defined(sgi) || defined(__sun)
 #define STRICT_SYSV_CURSES       /* Don't use ncurses extensions */
 typedef chtype attr_t;           /* No attr_t type is available */
 #endif

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 2ca99c96b129eadb747a0a28a39a3ed37fbf42d8..053d2bae16ee7014221abe730657b196086882a5 100644 (file)
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -94,7 +94,7 @@ Socket methods:
 #ifdef HAVE_GETHOSTBYNAME_R
 #if defined(_AIX) || defined(__osf__)
 #define HAVE_GETHOSTBYNAME_R_3_ARG
-#elif defined(__sun__) || defined(__sgi)
+#elif defined(__sun) || defined(__sgi)
 #define HAVE_GETHOSTBYNAME_R_5_ARG
 #elif defined(linux)
 /* Rely on the configure script */