[Python-checkins] cpython (merge 3.5 -> 3.6): Issue #28676: merge from 3.5

Sat Nov 12 16:40:38 EST 2016

https://hg.python.org/cpython/rev/e2faa8a22b69
changeset: 105079:e2faa8a22b69
branch: 3.6
parent: 105075:51a9c1c9272c
parent: 105078:0efd48d4c47c
user: Ned Deily <nad at python.org>
date: Sat Nov 12 16:38:03 2016 -0500
summary:
 Issue #28676: merge from 3.5
files:
 Misc/NEWS | 6 ++++++
 Python/random.c | 5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -68,6 +68,12 @@
 
 - Issue #23839: Various caches now are cleared before running every test file.
 
+Build
+-----
+
+- Issue #28676: Prevent missing 'getentropy' declaration warning on macOS.
+ Patch by Gareth Rees.
+
 
 What's New in Python 3.6.0 beta 3
 =================================
diff --git a/Python/random.c b/Python/random.c
--- a/Python/random.c
+++ b/Python/random.c
@@ -12,9 +12,10 @@
 # ifdef HAVE_LINUX_RANDOM_H
 # include <linux/random.h>
 # endif
-# ifdef HAVE_GETRANDOM
+# if defined(HAVE_GETRANDOM) || defined(HAVE_GETENTROPY)
 # include <sys/random.h>
-# elif defined(HAVE_GETRANDOM_SYSCALL)
+# endif
+# if !defined(HAVE_GETRANDOM) && defined(HAVE_GETRANDOM_SYSCALL)
 # include <sys/syscall.h>
 # endif
 #endif
-- 
Repository URL: https://hg.python.org/cpython
