mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-26 09:31:08 +08:00
88 lines
3.0 KiB
Diff
88 lines
3.0 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 0a279c8..8e771ee 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -136,7 +136,7 @@ if (NOT MSVC)
|
|
check_include_files(fcntl.h HAVE_FCNTL_H)
|
|
check_function_exists(fpclass HAVE_FPCLASS)
|
|
check_function_exists(ftime HAVE_FTIME)
|
|
- check_function_exists(getentropy HAVE_GETENTROPY)
|
|
+ check_symbol_exists(getentropy "sys/random.h" HAVE_GETENTROPY)
|
|
check_function_exists(gettimeofday HAVE_GETTIMEOFDAY)
|
|
check_library_exists(history append_history "" HAVE_LIBHISTORY)
|
|
check_library_exists(readline readline "" HAVE_LIBREADLINE)
|
|
@@ -149,7 +149,6 @@ if (NOT MSVC)
|
|
check_function_exists(stat HAVE_STAT)
|
|
check_include_files(stdint.h HAVE_STDINT_H)
|
|
check_include_files(sys/mman.h HAVE_SYS_MMAN_H)
|
|
- check_include_files(sys/random.h HAVE_SYS_RANDOM_H)
|
|
check_include_files(sys/select.h HAVE_SYS_SELECT_H)
|
|
check_include_files(sys/socket.h HAVE_SYS_SOCKET_H)
|
|
check_include_files(sys/stat.h HAVE_SYS_STAT_H)
|
|
diff --git a/config.h.cmake.in b/config.h.cmake.in
|
|
index 2f4aeba..79f1cdb 100644
|
|
--- a/config.h.cmake.in
|
|
+++ b/config.h.cmake.in
|
|
@@ -69,9 +69,6 @@
|
|
/* Define to 1 if you have the <sys/mman.h> header file. */
|
|
#cmakedefine HAVE_SYS_MMAN_H 1
|
|
|
|
-/* Define to 1 if you have the <sys/random.h> header file. */
|
|
-#cmakedefine HAVE_SYS_RANDOM_H 1
|
|
-
|
|
/* Define to 1 if you have the <sys/select.h> header file. */
|
|
#cmakedefine HAVE_SYS_SELECT_H 1
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 48cd2f0..0f09c61 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -304,7 +304,6 @@ AC_CHECK_HEADERS([stdint.h])
|
|
AC_CHECK_HEADERS([fcntl.h unistd.h sys/stat.h])
|
|
AC_CHECK_HEADERS([sys/mman.h])
|
|
AC_CHECK_HEADERS([sys/time.h sys/timeb.h])
|
|
-AC_CHECK_HEADERS([sys/random.h])
|
|
AC_CHECK_HEADERS([dl.h dlfcn.h])
|
|
AC_CHECK_HEADERS([glob.h])
|
|
AM_CONDITIONAL(WITH_GLOB, test "$ac_cv_header_glob_h" = "yes")
|
|
@@ -317,9 +316,7 @@ AH_VERBATIM([HAVE_MUNMAP_AFTER],[/* mmap() is no good without munmap() */
|
|
# undef /**/ HAVE_MMAP
|
|
#endif])
|
|
|
|
-AC_CHECK_DECL([getentropy],
|
|
- [AC_DEFINE([HAVE_GETENTROPY], [1], [getentropy])], [],
|
|
- [#include <sys/random.h>])
|
|
+AC_CHECK_DECLS([getentropy], [], [], [#include <sys/random.h>])
|
|
|
|
dnl
|
|
dnl Checks for inet libraries
|
|
diff --git a/dict.c b/dict.c
|
|
index 49e1c6b..46bb4d4 100644
|
|
--- a/dict.c
|
|
+++ b/dict.c
|
|
@@ -928,13 +928,11 @@ xmlDictQLookup(xmlDictPtr dict, const xmlChar *prefix, const xmlChar *name) {
|
|
#define WIN32_LEAN_AND_MEAN
|
|
#include <windows.h>
|
|
#include <bcrypt.h>
|
|
-#elif defined(HAVE_GETENTROPY)
|
|
+#elif HAVE_GETENTROPY
|
|
#ifdef HAVE_UNISTD_H
|
|
#include <unistd.h>
|
|
#endif
|
|
- #ifdef HAVE_SYS_RANDOM_H
|
|
- #include <sys/random.h>
|
|
- #endif
|
|
+ #include <sys/random.h>
|
|
#else
|
|
#include <time.h>
|
|
#endif
|
|
@@ -965,7 +963,7 @@ xmlInitRandom(void) {
|
|
"error code %lu\n", GetLastError());
|
|
abort();
|
|
}
|
|
-#elif defined(HAVE_GETENTROPY)
|
|
+#elif HAVE_GETENTROPY
|
|
while (1) {
|
|
if (getentropy(globalRngState, sizeof(globalRngState)) == 0)
|
|
break;
|