bpo-35550: Fix incorrect Solaris define guards (GH-11275)
Python source code uses on several places ifdef sun or defined(sun) without the underscores, which is not standard compliant and shouldn't be used.
Defines should check for __sun instead. Reference: http://nadeausoftware.com/articles/2012/01/c_c_tip_how_use_compiler_predefined_macros_detect_operating_systemGH-Solaris
https://bugs.python.org/issue35550
(cherry picked from commit 6f9bc72c79c3262e5d0f2c0e96b016477399cfb1)
Co-authored-by: Jakub Kulík <Kulikjak@gmail.com>
diff --git a/Misc/NEWS.d/next/Build/2018-12-29-10-19-43.bpo-35550.BTuu8e.rst b/Misc/NEWS.d/next/Build/2018-12-29-10-19-43.bpo-35550.BTuu8e.rst
new file mode 100644
index 0000000..8a6b90d
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2018-12-29-10-19-43.bpo-35550.BTuu8e.rst
@@ -0,0 +1 @@
+Fix incorrect Solaris #ifdef checks to look for __sun && __SVR4 instead of sun when compiling.
\ No newline at end of file
diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c
index 851aa97..3cf0683 100644
--- a/Modules/_posixsubprocess.c
+++ b/Modules/_posixsubprocess.c
@@ -30,7 +30,7 @@
# define SYS_getdents64 __NR_getdents64
#endif
-#if defined(sun)
+#if defined(__sun) && defined(__SVR4)
/* readdir64 is used to work around Solaris 9 bug 6395699. */
# define readdir readdir64
# define dirent dirent64
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 383999e..909b06e 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -5926,7 +5926,7 @@
#endif
#if defined(HAVE_DEV_PTMX) && !defined(HAVE_OPENPTY) && !defined(HAVE__GETPTY)
PyOS_sighandler_t sig_saved;
-#ifdef sun
+#if defined(__sun) && defined(__SVR4)
extern char *ptsname(int fildes);
#endif
#endif
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 661e1bd..988471e 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -265,7 +265,7 @@
#endif
/* Solaris fails to define this variable at all. */
-#if defined(sun) && !defined(INET_ADDRSTRLEN)
+#if (defined(__sun) && defined(__SVR4)) && !defined(INET_ADDRSTRLEN)
#define INET_ADDRSTRLEN 16
#endif
diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index 5e99bd8..bbfb7db 100644
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -725,7 +725,7 @@
return NULL;
}
-#if defined(_MSC_VER) || defined(sun) || defined(_AIX)
+#if defined(_MSC_VER) || (defined(__sun) && defined(__SVR4)) || defined(_AIX)
if (buf.tm_year + 1900 < 1 || 9999 < buf.tm_year + 1900) {
PyErr_SetString(PyExc_ValueError,
"strftime() requires year in [1; 9999]");
@@ -771,7 +771,7 @@
return NULL;
}
}
-#elif (defined(_AIX) || defined(sun)) && defined(HAVE_WCSFTIME)
+#elif (defined(_AIX) || (defined(__sun) && defined(__SVR4))) && defined(HAVE_WCSFTIME)
for (outbuf = wcschr(fmt, '%');
outbuf != NULL;
outbuf = wcschr(outbuf+2, '%'))
diff --git a/Python/bootstrap_hash.c b/Python/bootstrap_hash.c
index e2afba2..58b0802 100644
--- a/Python/bootstrap_hash.c
+++ b/Python/bootstrap_hash.c
@@ -116,7 +116,7 @@
flags = blocking ? 0 : GRND_NONBLOCK;
dest = buffer;
while (0 < size) {
-#ifdef sun
+#if defined(__sun) && defined(__SVR4)
/* Issue #26735: On Solaris, getrandom() is limited to returning up
to 1024 bytes. Call it multiple times if more bytes are
requested. */
@@ -266,7 +266,7 @@
}
return 1;
}
-#endif /* defined(HAVE_GETENTROPY) && !defined(sun) */
+#endif /* defined(HAVE_GETENTROPY) && !(defined(__sun) && defined(__SVR4)) */
static struct {