[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  cbb259caaf2cabf9bedc35fd41ba84f048a3de0f (commit)
      from  316fae2a948afc1eb3a6d3d8b294156c011df133 (commit)


- Log -----------------------------------------------------------------
commit cbb259caaf2cabf9bedc35fd41ba84f048a3de0f
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Mon Feb 22 16:54:57 2016 +0000

    RT4334: Check UEFI before __STDC_VERSION__ for <inttypes.h>
    
    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 at openssl.org>
    Reviewed-by: Tim Hudson <tjh at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 include/openssl/e_os2.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/openssl/e_os2.h b/include/openssl/e_os2.h
index b66b1cc..ba3345a 100644
--- a/include/openssl/e_os2.h
+++ b/include/openssl/e_os2.h
@@ -286,11 +286,7 @@ extern "C" {
 # endif
 
 /* Standard integer types */
-# if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \
-     defined(__osf__) || defined(__sgi) || defined(__hpux) || \
-     defined(OPENSSL_SYS_VMS)
-#  include <inttypes.h>
-# elif defined(OPENSSL_SYS_UEFI)
+# if defined(OPENSSL_SYS_UEFI)
 typedef INT8 int8_t;
 typedef UINT8 uint8_t;
 typedef INT16 int16_t;
@@ -299,7 +295,11 @@ typedef INT32 int32_t;
 typedef UINT32 uint32_t;
 typedef INT64 int64_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
 /*
  * minimally required typdefs for systems not supporting inttypes.h or