diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index a56a67c4af2..6f79aa02d30 100644
--- 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 2ca99c96b12..053d2bae16e 100644
--- 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 */