merge 3.6 (#28932)
This commit is contained in:
commit
38f225dd48
|
@ -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.
|
||||
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue