diff options
| -rw-r--r-- | include/curl/system.h | 23 | ||||
| -rw-r--r-- | lib/config-mac.h | 11 |
2 files changed, 27 insertions, 7 deletions
diff --git a/include/curl/system.h b/include/curl/system.h index df69d4f7d..11db51ecf 100644 --- a/include/curl/system.h +++ b/include/curl/system.h @@ -164,13 +164,22 @@ # endif # define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int -#elif defined(__MWERKS__) -# 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 int +#elif defined(macintosh) +# include <ConditionalMacros.h> +# if TYPE_LONGLONG +# 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 +# else +# define CURL_TYPEOF_CURL_OFF_T long +# define CURL_FORMAT_CURL_OFF_T "ld" +# define CURL_FORMAT_CURL_OFF_TU "lu" +# define CURL_SUFFIX_CURL_OFF_T L +# define CURL_SUFFIX_CURL_OFF_TU UL +# endif +# define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int #elif defined(__TANDEM) # if ! defined(__LP64) diff --git a/lib/config-mac.h b/lib/config-mac.h index 4a66edf6b..2d3eec3cb 100644 --- a/lib/config-mac.h +++ b/lib/config-mac.h @@ -34,6 +34,11 @@ #define OS "mac" #endif +#include <ConditionalMacros.h> +#if TYPE_LONGLONG +#define HAVE_LONGLONG 1 +#endif + /* Define if you want the built-in manual */ #define USE_MANUAL 1 @@ -77,7 +82,13 @@ #define HAVE_IOCTL_FIONBIO 1 #define SIZEOF_INT 4 +#define SIZEOF_LONG 4 #define SIZEOF_SIZE_T 4 +#ifdef HAVE_LONGLONG +#define SIZEOF_CURL_OFF_T 8 +#else +#define SIZEOF_CURL_OFF_T 4 +#endif #define HAVE_RECV 1 #define RECV_TYPE_ARG1 int |