From 1fd73818df53ae51adb681a34b2d5bca4bb37e49 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Sun, 15 Oct 2023 19:05:29 -0500 Subject: [PATCH] adjust how sizeof time_t is set, the current way causes issues with MSVC 2022's preprocessor --- CMakeLists.txt | 1 - include/compat/time.h | 8 ++++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c2e4ba04f..61ff1860fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -404,7 +404,6 @@ if(SIZEOF_TIME_T STREQUAL "4") message(WARNING " ** Warning, this system is unable to represent times past 2038\n" " ** It will behave incorrectly when handling valid RFC5280 dates") endif() -add_definitions(-DSIZEOF_TIME_T=${SIZEOF_TIME_T}) set(OPENSSL_LIBS ssl crypto ${PLATFORM_LIBS}) set(LIBTLS_LIBS tls ${PLATFORM_LIBS}) diff --git a/include/compat/time.h b/include/compat/time.h index 540807dd88..27485218fb 100644 --- a/include/compat/time.h +++ b/include/compat/time.h @@ -3,6 +3,14 @@ * sys/time.h compatibility shim */ +#ifndef SIZEOF_TIME_T +#ifdef SMALL_TIME_T +#define SIZEOF_TIME_T 4 +#else +#define SIZEOF_TIME_T 8 +#endif +#endif + #ifdef _MSC_VER #if _MSC_VER >= 1900 #include <../ucrt/time.h>