diff options
| author | Brad King <brad.king@kitware.com> | 2009-12-17 20:16:13 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2009-12-17 20:16:13 (GMT) |
| commit | ba7ccc8bf459e2111c7e30c9e5923d3c26f44049 (patch) | |
| tree | e13c6469eb3b6125cfed41e3ef6f00dc1cebc531 /Utilities/cmcurl/config.h.in | |
| parent | 5d4a07462de80fea0242e0e983543a13b0d04410 (diff) | |
| download | CMake-ba7ccc8bf459e2111c7e30c9e5923d3c26f44049.zip CMake-ba7ccc8bf459e2111c7e30c9e5923d3c26f44049.tar.gz CMake-ba7ccc8bf459e2111c7e30c9e5923d3c26f44049.tar.bz2 | |
cmcurl: Use arch-aware CHECK_TYPE_SIZE result
Our new CHECK_TYPE_SIZE macro produces a SIZEOF_<type>_CODE value for
use in configured headers to get architecture-aware type size results.
In this commit we teach cmcurl to use the SIZEOF_<type>_CODE value to
get proper configured type sizes in OS X Universal Binaries.
Diffstat (limited to 'Utilities/cmcurl/config.h.in')
| -rw-r--r-- | Utilities/cmcurl/config.h.in | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/Utilities/cmcurl/config.h.in b/Utilities/cmcurl/config.h.in index 6f2e5db..e3efdc1 100644 --- a/Utilities/cmcurl/config.h.in +++ b/Utilities/cmcurl/config.h.in @@ -640,16 +640,25 @@ #cmakedefine SEND_TYPE_RETV ${SEND_TYPE_RETV} /* The size of `curl_off_t', as computed by sizeof. */ -#cmakedefine SIZEOF_CURL_OFF_T ${SIZEOF_CURL_OFF_T} +@SIZEOF_CURL_OFF_T_CODE@ /* The size of `long', as computed by sizeof. */ -#cmakedefine SIZEOF_LONG ${SIZEOF_LONG} +@SIZEOF_LONG_CODE@ + +/* The size of `long long', as computed by sizeof. */ +@SIZEOF_LONG_LONG_CODE@ + +/* The size of `__int64', as computed by sizeof. */ +@SIZEOF___INT64_CODE@ /* The size of `size_t', as computed by sizeof. */ -#cmakedefine SIZEOF_SIZE_T ${SIZEOF_SIZE_T} +@SIZEOF_SIZE_T_CODE@ + +/* The size of `ssize_t', as computed by sizeof. */ +@SIZEOF_SSIZE_T_CODE@ /* The size of `time_t', as computed by sizeof. */ -#cmakedefine SIZEOF_TIME_T ${SIZEOF_TIME_T} +@SIZEOF_TIME_T_CODE@ /* Define to 1 if you have the ANSI C header files. */ #cmakedefine STDC_HEADERS ${STDC_HEADERS} @@ -713,7 +722,17 @@ #cmakedefine socklen_t ${socklen_t} /* the signed version of size_t */ -#cmakedefine ssize_t ${ssize_t} +#ifndef SIZEOF_SSIZE_T +# if SIZEOF_LONG == SIZEOF_SIZE_T + typedef long ssize_t; +# elif SIZEOF_LONG_LONG == SIZEOF_SIZE_T + typedef long long ssize_t; +# elif SIZEOF___INT64 == SIZEOF_SIZE_T + typedef __int64 ssize_t; +# else + typedef int ssize_t; +# endif +#endif /* Special handling of zlib library */ #cmakedefine CURL_SPECIAL_ZLIB_H "${CURL_SPECIAL_ZLIB_H}" |