Merge 3.5

This commit is contained in:
Victor Stinner 2015-10-01 10:01:31 +02:00
commit 0e25a8f225
1 changed files with 2 additions and 0 deletions

View File

@ -111,6 +111,8 @@ 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