The branch OpenSSL_1_1_0-stable has been updated
via 9317235bbb43fbe8ee21cc3bfe0effb9ab6dee2e (commit)
from 9d7a0588b3e375fa29adca030656fed816cf18e5 (commit)
- Log -----------------------------------------------------------------
commit 9317235bbb43fbe8ee21cc3bfe0effb9ab6dee2e
Author: Qin Long <[email protected]>
Date: Wed Apr 5 01:08:16 2017 +0800
e_os2.h: Refine OSSL_SSIZE definition under UEFI environment
Under UEFI build environment, we may encounter the OSSL_SSIZE macro
re-definition error in e_os2.h if any module call OpenSSL API directly
by including "openssl/xxxx.h" (caused by the predefined _WIN32/_WIN64
macro, which should have been un-defined under OPENSSL_SYS_UEFI).
Though it's not one recommended usage, this patch could still eliminate
the possible build issue by refining the OSSL_SSIZE definition under
OPENSSL_SYS_UEFI.
Reviewed-by: Rich Salz <[email protected]>
Reviewed-by: Andy Polyakov <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/3121)
(cherry picked from commit 005f6766284155645fa760cf764f85031e209f6c)
-----------------------------------------------------------------------
Summary of changes:
include/openssl/e_os2.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/openssl/e_os2.h b/include/openssl/e_os2.h
index 1f3ecb6..4aec51f 100644
--- a/include/openssl/e_os2.h
+++ b/include/openssl/e_os2.h
@@ -212,9 +212,9 @@ extern "C" {
# endif
# endif
-# if defined(OPENSSL_SYS_UEFI) && !defined(ssize_t)
-# define ossl_ssize_t int
-# define OSSL_SSIZE_MAX INT_MAX
+# if defined(OPENSSL_SYS_UEFI) && !defined(ossl_ssize_t)
+# define ossl_ssize_t INTN
+# define OSSL_SSIZE_MAX MAX_INTN
# endif
# ifndef ossl_ssize_t
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
