From 124457151e3b9a68297cb8ad3be50b1b559bcfdd Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Sat, 8 Dec 2012 04:51:58 +0000 Subject: [PATCH] https://issues.shibboleth.net/jira/browse/CPPOST-80 --- config_win32.h | 6 +----- configure.ac | 1 - saml/internal.h | 6 +----- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/config_win32.h b/config_win32.h index 4d60586..7402cc1 100644 --- a/config_win32.h +++ b/config_win32.h @@ -112,8 +112,4 @@ /* #undef const */ /* Define to `unsigned' if does not define. */ -/* #undef size_t */ - -/* The size of a `time_t', as computed by sizeof. */ -#define SIZEOF_TIME_T 8 - +/* #undef size_t */ \ No newline at end of file diff --git a/configure.ac b/configure.ac index b85bf18..4d2b783 100644 --- a/configure.ac +++ b/configure.ac @@ -70,7 +70,6 @@ AC_HEADER_DIRENT # Checks for library functions. AC_CHECK_FUNCS([strchr strdup strstr]) -AC_CHECK_SIZEOF(time_t) # checks for pthreads ACX_PTHREAD([enable_threads="pthread"],[enable_threads="no"]) diff --git a/saml/internal.h b/saml/internal.h index 774f7fe..a017016 100644 --- a/saml/internal.h +++ b/saml/internal.h @@ -80,11 +80,7 @@ using namespace xercesc; #endif #endif -#if SIZEOF_TIME_T == 8 -# define SAMLTIME_MAX LLONG_MAX -#elif SIZEOF_TIME_T == 4 -# define SAMLTIME_MAX INT_MAX -#endif +#define SAMLTIME_MAX (sizeof(time_t) == 8 ? LLONG_MAX : INT_MAX) #define SAML_LOGCAT "OpenSAML" -- 2.1.4