diff --git a/cmake/Libraries.cmake b/cmake/Libraries.cmake index a4fc40417..61da376be 100644 --- a/cmake/Libraries.cmake +++ b/cmake/Libraries.cmake @@ -83,7 +83,6 @@ macro(configure_unix_libs) include(CheckCSourceCompiles) check_include_files(sys/socket.h HAVE_SYS_SOCKET_H) - check_include_files(sys/time.h HAVE_SYS_TIME_H) check_include_files(unistd.h HAVE_UNISTD_H) check_function_exists(sigwait HAVE_POSIX_SIGWAIT) @@ -155,7 +154,6 @@ macro(configure_unix_libs) # For config.h, set some static values; it may be a good idea to make these # values dynamic for non-standard UNIX compilers. set(HAVE_PTHREAD_SIGNAL 1) - set(TIME_WITH_SYS_TIME 1) set(HAVE_SOCKLEN_T 1) # Unix only: For config.h, save the results based on a template (config.h.in). diff --git a/src/lib/Config.h.in b/src/lib/Config.h.in index 286d69e83..0b93f3f58 100644 --- a/src/lib/Config.h.in +++ b/src/lib/Config.h.in @@ -28,9 +28,6 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_SYS_SOCKET_H @HAVE_SYS_SOCKET_H@ -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_TIME_H @HAVE_SYS_TIME_H@ - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_SYS_TYPES_H @HAVE_SYS_TYPES_H@ @@ -55,9 +52,6 @@ /* Define this if the XKB extension is available. */ #cmakedefine HAVE_XKB_EXTENSION @HAVE_XKB_EXTENSION@ -/* Define to 1 if you can safely include both and . */ -#cmakedefine TIME_WITH_SYS_TIME @TIME_WITH_SYS_TIME@ - /* Define to 1 if the X Window System is missing or not being used. */ #cmakedefine X_DISPLAY_MISSING @X_DISPLAY_MISSING@ diff --git a/src/lib/arch/unix/ArchMultithreadPosix.cpp b/src/lib/arch/unix/ArchMultithreadPosix.cpp index e433855a5..96c5405e8 100644 --- a/src/lib/arch/unix/ArchMultithreadPosix.cpp +++ b/src/lib/arch/unix/ArchMultithreadPosix.cpp @@ -10,18 +10,10 @@ #include "arch/Arch.h" #include "arch/XArch.h" -#include -#if TIME_WITH_SYS_TIME -#include -#include -#else -#if HAVE_SYS_TIME_H -#include -#else -#include -#endif -#endif #include +#include +#include +#include #define SIGWAKEUP SIGUSR1