generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

RT4334: Check UEFI before __STDC_VERSION__ for <inttypes.h>

Browse Source 
Adding -nostdinc to the EDK2 showed that we were including <inttypes.h>
for some UEFI builds, because the check for __STDC_VERSION__ happens
before the check for OPENSSL_SYS_UEFI. Fix that.

Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
David Woodhouse 2016-02-22 16:54:57 +00:00 committed by Rich Salz
parent 316fae2a94
commit cbb259caaf
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/openssl/e_os2.h
View File

@ -286,11 +286,7 @@ extern "C" {
# endif # endif
/* Standard integer types */ /* Standard integer types */
# if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \ # if defined(OPENSSL_SYS_UEFI)
defined(__osf__) || defined(__sgi) || defined(__hpux) || \
defined(OPENSSL_SYS_VMS)
# include <inttypes.h>
# elif defined(OPENSSL_SYS_UEFI)
typedef INT8 int8_t; typedef INT8 int8_t;
typedef UINT8 uint8_t; typedef UINT8 uint8_t;
typedef INT16 int16_t; typedef INT16 int16_t;
@ -299,7 +295,11 @@ typedef INT32 int32_t;
typedef UINT32 uint32_t; typedef UINT32 uint32_t;
typedef INT64 int64_t; typedef INT64 int64_t;
typedef UINT64 uint64_t; typedef UINT64 uint64_t;
#define PRIu64 "%Lu" # define PRIu64 "%Lu"
# elif (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \
defined(__osf__) || defined(__sgi) || defined(__hpux) || \
defined(OPENSSL_SYS_VMS)
# include <inttypes.h>
# elif defined(_MSC_VER) && _MSC_VER<=1500 # elif defined(_MSC_VER) && _MSC_VER<=1500
/* /*
* minimally required typdefs for systems not supporting inttypes.h or * minimally required typdefs for systems not supporting inttypes.h or