diff options
| author | Benjamin Peterson <benjamin@python.org> | 2016-12-20 07:55:24 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2016-12-20 07:55:24 (GMT) |
| commit | 38f225dd486ab69779eab3cae4fa2375f6c2d8d6 (patch) | |
| tree | 150e57264b2c9d0b2a3fdc3717282dc29e3e0b36 | |
| parent | 2ea5bfee1959c23d02d7d24ed74b1b3b773d8902 (diff) | |
| parent | b0eb986eb236c41ebf098233940e038c7b993b9f (diff) | |
| download | cpython-38f225dd486ab69779eab3cae4fa2375f6c2d8d6.zip cpython-38f225dd486ab69779eab3cae4fa2375f6c2d8d6.tar.gz cpython-38f225dd486ab69779eab3cae4fa2375f6c2d8d6.tar.bz2 | |
merge 3.6 (#28932)
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Python/random.c | 2 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | pyconfig.h.in | 3 |
5 files changed, 8 insertions, 3 deletions
@@ -13,6 +13,8 @@ Core and Builtins - Issue #28927: bytes.fromhex() and bytearray.fromhex() now ignore all ASCII whitespace, not only spaces. Patch by Robert Xiao. +- Issue #28932: Do not include <sys/random.h> if it does not exist. + - Issue #25677: Correct the positioning of the syntax error caret for indented blocks. Based on patch by Michael Layzell. diff --git a/Python/random.c b/Python/random.c index 46e3bb5..f9d600f 100644 --- a/Python/random.c +++ b/Python/random.c @@ -12,7 +12,7 @@ # ifdef HAVE_LINUX_RANDOM_H # include <linux/random.h> # endif -# if defined(HAVE_GETRANDOM) || defined(HAVE_GETENTROPY) +# ifdef HAVE_SYS_RANDOM_H # include <sys/random.h> # endif # if !defined(HAVE_GETRANDOM) && defined(HAVE_GETRANDOM_SYSCALL) @@ -7763,7 +7763,7 @@ unistd.h utime.h \ poll.h sys/devpoll.h sys/epoll.h sys/poll.h \ sys/audioio.h sys/xattr.h sys/bsdtty.h sys/event.h sys/file.h sys/ioctl.h \ sys/kern_control.h sys/loadavg.h sys/lock.h sys/mkdev.h sys/modem.h \ -sys/param.h sys/select.h sys/sendfile.h sys/socket.h sys/statvfs.h \ +sys/param.h sys/random.h sys/select.h sys/sendfile.h sys/socket.h sys/statvfs.h \ sys/stat.h sys/syscall.h sys/sys_domain.h sys/termio.h sys/time.h \ sys/times.h sys/types.h sys/uio.h sys/un.h sys/utsname.h sys/wait.h pty.h \ libutil.h sys/resource.h netpacket/packet.h sysexits.h bluetooth.h \ diff --git a/configure.ac b/configure.ac index 1547de5..39273e0 100644 --- a/configure.ac +++ b/configure.ac @@ -2019,7 +2019,7 @@ unistd.h utime.h \ poll.h sys/devpoll.h sys/epoll.h sys/poll.h \ sys/audioio.h sys/xattr.h sys/bsdtty.h sys/event.h sys/file.h sys/ioctl.h \ sys/kern_control.h sys/loadavg.h sys/lock.h sys/mkdev.h sys/modem.h \ -sys/param.h sys/select.h sys/sendfile.h sys/socket.h sys/statvfs.h \ +sys/param.h sys/random.h sys/select.h sys/sendfile.h sys/socket.h sys/statvfs.h \ sys/stat.h sys/syscall.h sys/sys_domain.h sys/termio.h sys/time.h \ sys/times.h sys/types.h sys/uio.h sys/un.h sys/utsname.h sys/wait.h pty.h \ libutil.h sys/resource.h netpacket/packet.h sysexits.h bluetooth.h \ diff --git a/pyconfig.h.in b/pyconfig.h.in index bfccabe..06bb248 100644 --- a/pyconfig.h.in +++ b/pyconfig.h.in @@ -1036,6 +1036,9 @@ /* Define to 1 if you have the <sys/poll.h> header file. */ #undef HAVE_SYS_POLL_H +/* Define to 1 if you have the <sys/random.h> header file. */ +#undef HAVE_SYS_RANDOM_H + /* Define to 1 if you have the <sys/resource.h> header file. */ #undef HAVE_SYS_RESOURCE_H |