diff options
| author | Ned Deily <nad@python.org> | 2016-11-12 21:39:52 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@python.org> | 2016-11-12 21:39:52 (GMT) |
| commit | cf767ab4dac1315da42d283eb9bf8e5de225511d (patch) | |
| tree | d9060d3a80cd374c351267a9ddae0d956ef1d26e | |
| parent | a8f2f5ab0d40d654946a2988e0c8d390bcf790a5 (diff) | |
| parent | 7d895d3c37e2ff5189d2d8b71def4e2fee34f10b (diff) | |
| download | cpython-cf767ab4dac1315da42d283eb9bf8e5de225511d.zip cpython-cf767ab4dac1315da42d283eb9bf8e5de225511d.tar.gz cpython-cf767ab4dac1315da42d283eb9bf8e5de225511d.tar.bz2 | |
Issue #28676: merge from 3.6
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Python/random.c | 5 |
2 files changed, 6 insertions, 2 deletions
@@ -437,6 +437,9 @@ Build - 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 index 6f9f711..46e3bb5 100644 --- 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 |