Issue #28676: merge from 3.5

Misc/NEWS

@@ -68,6 +68,12 @@ Tests
 
 - 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
 =================================

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