From: David Woodhouse <David.Woodhouse@intel.com>
Date: Wed, 17 Feb 2016 14:11:32 +0000 (+0000)
Subject: RT4318: Fix OSSL_SSIZE_MAX for UEFI build
X-Git-Tag: OpenSSL_1_1_0-pre4~640
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=21b80f9a1246e4af099ed580f1c352ed5bde87cb;p=oweals%2Fopenssl.git

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@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
---

diff --git a/include/openssl/e_os2.h b/include/openssl/e_os2.h
index 1a1fe3ebdf..8cf6c84272 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