From 3feb6b46a287f21c0a3afe4b1e7b348a0d789d78 Mon Sep 17 00:00:00 2001 From: Jay Satiro Date: Fri, 20 Jan 2023 18:37:44 -0500 Subject: [PATCH] system.h: assume OS400 is always built with ILEC compiler Prior to this change the OS400 types were only defined when __ILEC400__. That symbol is only defined by IBM's C compiler and not their C++ compiler, which led to missing types when users on OS400 would compile a C++ application that included curl. The IBM C and C++ compilers are the only native compilers on the platform. Assisted-by: Jon Rumsey Reported-by: John Sherrill Fixes https://github.com/curl/curl/issues/10305 Closes https://github.com/curl/curl/pull/10329 --- include/curl/system.h | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/include/curl/system.h b/include/curl/system.h index 0eddeb8038..def7739242 100644 --- a/include/curl/system.h +++ b/include/curl/system.h @@ -227,16 +227,14 @@ # define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int #elif defined(__OS400__) -# if defined(__ILEC400__) -# define CURL_TYPEOF_CURL_OFF_T long long -# define CURL_FORMAT_CURL_OFF_T "lld" -# define CURL_FORMAT_CURL_OFF_TU "llu" -# define CURL_SUFFIX_CURL_OFF_T LL -# define CURL_SUFFIX_CURL_OFF_TU ULL -# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t -# define CURL_PULL_SYS_TYPES_H 1 -# define CURL_PULL_SYS_SOCKET_H 1 -# endif +# define CURL_TYPEOF_CURL_OFF_T long long +# define CURL_FORMAT_CURL_OFF_T "lld" +# define CURL_FORMAT_CURL_OFF_TU "llu" +# define CURL_SUFFIX_CURL_OFF_T LL +# define CURL_SUFFIX_CURL_OFF_TU ULL +# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t +# define CURL_PULL_SYS_TYPES_H 1 +# define CURL_PULL_SYS_SOCKET_H 1 #elif defined(__MVS__) # if defined(__IBMC__) || defined(__IBMCPP__) -- 2.47.3