diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2019-06-11 18:16:51 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2019-06-11 21:27:55 +1000 |
| commit | 92bec78a26139185c840a5d516a2aa171b20e269 (patch) | |
| tree | 1e9033f7fc737e774f23f7ff89285f7631eefb80 /include | |
| parent | f0efeea29eca6e528a976f62ae2422eee34ea0eb (diff) | |
Add defines to indicate if intypes.h and stdint.h are unavailable
Use the defines OPENSSL_NO_INTTYPES_H & OPENSSL_NO_STDINT_H to determine
if the headers are unavailable for a platform.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8986)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/e_os2.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/openssl/e_os2.h b/include/openssl/e_os2.h index b88abc1791..50ce937fd1 100644 --- a/include/openssl/e_os2.h +++ b/include/openssl/e_os2.h @@ -228,6 +228,8 @@ extern "C" { # endif /* Standard integer types */ +# define OPENSSL_NO_INTTYPES_H +# define OPENSSL_NO_STDINT_H # if defined(OPENSSL_SYS_UEFI) typedef INT8 int8_t; typedef UINT8 uint8_t; @@ -241,6 +243,9 @@ typedef UINT64 uint64_t; defined(__osf__) || defined(__sgi) || defined(__hpux) || \ defined(OPENSSL_SYS_VMS) || defined (__OpenBSD__) # include <inttypes.h> +# undef OPENSSL_NO_INTTYPES_H +/* Because the specs say that inttypes.h includes stdint.h if present */ +# undef OPENSSL_NO_STDINT_H # elif defined(_MSC_VER) && _MSC_VER<=1500 /* * minimally required typdefs for systems not supporting inttypes.h or @@ -256,6 +261,7 @@ typedef __int64 int64_t; typedef unsigned __int64 uint64_t; # else # include <stdint.h> +# undef OPENSSL_NO_STDINT_H # endif /* ossl_inline: portable inline definition usable in public headers */ |