| commit | 861f0672014067dc1cd5bf239ae188140f79b07d | [log] [tgz] |
|---|---|---|
| author | Victor Stinner <victor.stinner@gmail.com> | Thu Oct 01 10:00:23 2015 +0200 |
| committer | Victor Stinner <victor.stinner@gmail.com> | Thu Oct 01 10:00:23 2015 +0200 |
| tree | 30ad121ed293bdb547eeebc985a81c1cad536549 | |
| parent | bae2d6203fca3ecaaf9fbc7cee84ad83ddf52dc5 [diff] | |
| parent | 78cc2e89687f3f2b7fd404831a6ea19baccf8c81 [diff] |
Merge 3.4 (os.urandom)
diff --git a/Python/random.c b/Python/random.c index 1d57b1b..772bfef 100644 --- a/Python/random.c +++ b/Python/random.c
@@ -111,6 +111,8 @@ #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