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

[ned.deily]

https://hg.python.org/cpython/rev/b31a7efd8b31
changeset:   105080:b31a7efd8b31
parent:      105076:c674dade719f
parent:      105079:e2faa8a22b69
user:        Ned Deily <nad at python.org>
date:        Sat Nov 12 16:39:52 2016 -0500
summary:
  Issue #28676: merge from 3.6

files:
  Misc/NEWS       |  3 +++
  Python/random.c |  5 +++--
  2 files changed, 6 insertions(+), 2 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -437,6 +437,9 @@
 - Issue #15819: Remove redundant include search directory option for building
   outside the source tree.
 
+- Issue #28676: Prevent missing 'getentropy' declaration warning on macOS.
+  Patch by Gareth Rees.
+
 Tools/Demos
 -----------
 
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