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_system#Solaris

https://bugs.python.org/issue35550
This commit is contained in:
Jakub Kulík 2018-12-31 03:16:40 +01:00 committed by Gregory P. Smith
parent 30e023256a
commit 6f9bc72c79
6 changed files with 8 additions and 7 deletions

View file

@ -114,7 +114,7 @@ py_getrandom(void *buffer, Py_ssize_t size, int blocking, int raise)
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. */
@ -264,7 +264,7 @@ py_getentropy(char *buffer, Py_ssize_t size, int raise)
}
return 1;
}
#endif /* defined(HAVE_GETENTROPY) && !defined(sun) */
#endif /* defined(HAVE_GETENTROPY) && !(defined(__sun) && defined(__SVR4)) */
static struct {