[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  21b80f9a1246e4af099ed580f1c352ed5bde87cb (commit)
      from  c7b7938e75587d1ff8cf28c9de966623cfbe8858 (commit)


- Log -----------------------------------------------------------------
commit 21b80f9a1246e4af099ed580f1c352ed5bde87cb
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Wed Feb 17 14:11:32 2016 +0000

    RT4318: Fix OSSL_SSIZE_MAX for UEFI build
    
    Commit e634b448c ("Defines OSSL_SSIZE_MAX") introduced a definition of
    OSSL_SSIZE_MAX which broke the UEFI build. Fix that by making UEFI take
    the same definition as Ultrix (ssize_t == int).
    
    Signed-off-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 include/openssl/e_os2.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/openssl/e_os2.h b/include/openssl/e_os2.h
index 1a1fe3e..8cf6c84 100644
--- a/include/openssl/e_os2.h
+++ b/include/openssl/e_os2.h
@@ -269,7 +269,7 @@ extern "C" {
 #  endif
 # endif
 
-# if defined(__ultrix) && !defined(ssize_t)
+# if (defined(__ultrix) || defined(OPENSSL_SYS_UEFI)) && !defined(ssize_t)
 #  define ossl_ssize_t int
 #  define OSSL_SSIZE_MAX INT_MAX
 # endif