[Python-checkins] cpython (merge 3.5 -> 3.6): merge 3.5 (#29057)

[benjamin.peterson]

https://hg.python.org/cpython/rev/5d0cb1fd79ea
changeset:   105953:5d0cb1fd79ea
branch:      3.6
parent:      105947:09134b14c7ae
parent:      105951:9ab75789c554
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Jan 01 22:30:26 2017 -0600
summary:
  merge 3.5 (#29057)

files:
  Python/random.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Python/random.c b/Python/random.c
--- a/Python/random.c
+++ b/Python/random.c
@@ -12,7 +12,7 @@
 #  ifdef HAVE_LINUX_RANDOM_H
 #    include <linux/random.h>
 #  endif
-#  ifdef HAVE_SYS_RANDOM_H
+#  if defined(HAVE_SYS_RANDOM_H) && (defined(HAVE_GETRANDOM) || defined(HAVE_GETENTROPY))
 #    include <sys/random.h>
 #  endif
 #  if !defined(HAVE_GETRANDOM) && defined(HAVE_GETRANDOM_SYSCALL)

-- 
Repository URL: https://hg.python.org/cpython