From: Martin Panter Date: Fri, 10 Jun 2016 08:07:11 +0000 (+0000) Subject: Fix typo and move comment to appropriate condition X-Git-Tag: v3.5.2rc1~20 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=39b102535640effc4a5f09e0221f2dac00f862d7;p=thirdparty%2FPython%2Fcpython.git Fix typo and move comment to appropriate condition --- diff --git a/Python/random.c b/Python/random.c index ecfd44bbda39..07dacfe188e8 100644 --- a/Python/random.c +++ b/Python/random.c @@ -75,6 +75,8 @@ win32_urandom(unsigned char *buffer, Py_ssize_t size, int raise) return 0; } +/* Issue #25003: Don't use getentropy() on Solaris (available since + * Solaris 11.3), it is blocking whereas os.urandom() should not block. */ #elif defined(HAVE_GETENTROPY) && !defined(sun) #define PY_GETENTROPY 1 @@ -114,8 +116,6 @@ py_getentropy(unsigned char *buffer, Py_ssize_t size, int fatal) #else -/* Issue #25003: Don' use getentropy() on Solaris (available since - * Solaris 11.3), it is blocking whereas os.urandom() should not block. */ #if defined(HAVE_GETRANDOM) || defined(HAVE_GETRANDOM_SYSCALL) #define PY_GETRANDOM 1