drop newly unused HAVE_GETENTROPY and HAVE_SYS_RANDOM_H
Signed-off-by: Caolán McNamara <caolan.mcnamara@collabora.com> Change-Id: Iccfa44f56fb0d3b185df3c9c8457cf19d42f85f1pull/8704/head
parent
144b701453
commit
ee807283d4
|
@ -20,14 +20,6 @@
|
||||||
|
|
||||||
#include <poll.h>
|
#include <poll.h>
|
||||||
|
|
||||||
#ifdef HAVE_GETENTROPY
|
|
||||||
# include <unistd.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HAVE_SYS_RANDOM_H
|
|
||||||
# include <sys/random.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef __linux__
|
#ifdef __linux__
|
||||||
# include <sys/prctl.h>
|
# include <sys/prctl.h>
|
||||||
# include <sys/syscall.h>
|
# include <sys/syscall.h>
|
||||||
|
|
|
@ -106,9 +106,3 @@
|
||||||
/* Define to 1 if this is the WASM app build. */
|
/* Define to 1 if this is the WASM app build. */
|
||||||
#undef WASMAPP
|
#undef WASMAPP
|
||||||
|
|
||||||
/* Define to 1 if we have sys/random.h */
|
|
||||||
#undef HAVE_SYS_RANDOM_H
|
|
||||||
|
|
||||||
/* Define to 1 if we have a getentropy function */
|
|
||||||
#undef HAVE_GETENTROPY
|
|
||||||
|
|
||||||
|
|
32
configure.ac
32
configure.ac
|
@ -1050,38 +1050,6 @@ AC_SUBST(HAVE_CLANG)
|
||||||
AS_IF([test "$ENABLE_GTKAPP" != true],
|
AS_IF([test "$ENABLE_GTKAPP" != true],
|
||||||
[CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXXSTD"])
|
[CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXXSTD"])
|
||||||
|
|
||||||
SYS_RANDOM=
|
|
||||||
AC_LANG_PUSH([C++])
|
|
||||||
AC_LINK_IFELSE(
|
|
||||||
[AC_LANG_SOURCE([[
|
|
||||||
#include <sys/random.h>
|
|
||||||
int main()
|
|
||||||
{
|
|
||||||
char buffer[8];
|
|
||||||
getrandom(buffer, sizeof(buffer), GRND_NONBLOCK);
|
|
||||||
}
|
|
||||||
]])],
|
|
||||||
[SYS_RANDOM=TRUE])
|
|
||||||
AC_LANG_POP([C++])
|
|
||||||
|
|
||||||
if test "$SYS_RANDOM" == "TRUE" ; then
|
|
||||||
AC_DEFINE([HAVE_SYS_RANDOM_H],1,[Define to 1 if you have the <sys/random.h> header file.])
|
|
||||||
else
|
|
||||||
AC_DEFINE([HAVE_SYS_RANDOM_H],0,[Define to 1 if you have the <sys/random.h> header file.])
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_LINK_IFELSE(
|
|
||||||
[AC_LANG_SOURCE([[
|
|
||||||
#include <unistd.h>
|
|
||||||
int main()
|
|
||||||
{
|
|
||||||
char buffer[8];
|
|
||||||
getentropy(buffer, sizeof(buffer));
|
|
||||||
}
|
|
||||||
]])],
|
|
||||||
[AC_DEFINE([HAVE_GETENTROPY],1,[Define to 1 if you have getentropy() function in <unistd.h> header file.])],
|
|
||||||
[AC_DEFINE([HAVE_GETENTROPY],0,[Define to 1 if you have getentropy() function in <unistd.h> header file.])])
|
|
||||||
|
|
||||||
AS_IF([test -n "$LOKIT_PATH"],
|
AS_IF([test -n "$LOKIT_PATH"],
|
||||||
[CPPFLAGS="$CPPFLAGS -I${LOKIT_PATH}"])
|
[CPPFLAGS="$CPPFLAGS -I${LOKIT_PATH}"])
|
||||||
lokit_msg="$LOKIT_PATH"
|
lokit_msg="$LOKIT_PATH"
|
||||||
|
|
Loading…
Reference in New Issue