Issue #28676: merge from 3.6

This commit is contained in:
Ned Deily 2016-11-12 16:39:52 -05:00
commit cf767ab4da
2 changed files with 6 additions and 2 deletions

View file

@ -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
-----------

View file

@ -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