From a2a2e32c02643a0cec111511220227703fda1cd5 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 1 Jul 2024 20:15:00 +0200 Subject: Merging upstream version 1:11.4.2. Signed-off-by: Daniel Baumann --- configure.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure.cmake') diff --git a/configure.cmake b/configure.cmake index 5aefb673..85cf352e 100644 --- a/configure.cmake +++ b/configure.cmake @@ -316,7 +316,6 @@ ENDIF() # CHECK_FUNCTION_EXISTS (accept4 HAVE_ACCEPT4) CHECK_FUNCTION_EXISTS (access HAVE_ACCESS) -CHECK_FUNCTION_EXISTS (alarm HAVE_ALARM) SET(HAVE_ALLOCA 1) CHECK_FUNCTION_EXISTS (backtrace HAVE_BACKTRACE) CHECK_FUNCTION_EXISTS (backtrace_symbols HAVE_BACKTRACE_SYMBOLS) @@ -826,7 +825,6 @@ CHECK_CXX_SOURCE_COMPILES(" " HAVE_SOLARIS_STYLE_GETHOST) -SET(NO_ALARM 1 CACHE BOOL "No need to use alarm to implement timeout") # As a consequence of ALARMs no longer being used, thread # notification for KILL must close the socket to wake up @@ -942,6 +940,8 @@ SET(SPRINTF_RETURNS_INT 1) CHECK_STRUCT_HAS_MEMBER("struct timespec" tv_sec "time.h" STRUCT_TIMESPEC_HAS_TV_SEC) CHECK_STRUCT_HAS_MEMBER("struct timespec" tv_nsec "time.h" STRUCT_TIMESPEC_HAS_TV_NSEC) +CHECK_STRUCT_HAS_MEMBER("struct tm" tm_gmtoff "time.h" STRUCT_TM_HAS_TM_GMTOFF) + IF(NOT MSVC) CHECK_C_SOURCE_COMPILES( " -- cgit v1.2.3