Commit 005f6766 authored by Qin Long's avatar Qin Long Committed by Andy Polyakov
Browse files

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: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3121)
parent 9dfc5b96

include/openssl/e_os2.h

+3 −3
Original line number Diff line number Diff line
@@ -206,9 +206,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