From afc18ead283886bfe4b3e21d0a315aead31228af Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Fri, 14 Nov 2014 10:24:33 +0000 Subject: CryptoPkg: OpenSslSupport.h: edk2-ize offsetof() macro for gcc-4.8 / X64 Code added in SVN r16339 ("CryptoPkg Updates to support RFC3161 timestamp signature verification.") introduced many new uses of the offsetof() macro. Since the offsetof() macro in "OpenSslSupport.h" casts a pointer to an "int", it triggers a large number of error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] errors when building CryptoPkg with gcc-4.8 for X64. Remedy this by directing offsetof() to the OFFSET_OF() macro in "MdePkg/Include/Base.h" (which matches how "OpenSslSupport.h" resolves the va_*() macros too). Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek Build-tested-by: Scott Duplichan Reviewed-by: Jordan Justen Reviewed-by: Qin Long git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16388 6f19259b-4bc3-4df7-8a09-765794883524 --- CryptoPkg/Include/OpenSslSupport.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CryptoPkg') diff --git a/CryptoPkg/Include/OpenSslSupport.h b/CryptoPkg/Include/OpenSslSupport.h index 33eda7dd50..ed889e91c7 100644 --- a/CryptoPkg/Include/OpenSslSupport.h +++ b/CryptoPkg/Include/OpenSslSupport.h @@ -72,7 +72,7 @@ typedef VOID *FILE; portably, hence it is provided by a Standard C header file. For pre-Standard C compilers, here is a version that usually works (but watch out!): */ -#define offsetof(type, member) ( (int) & ((type*)0) -> member ) +#define offsetof(type, member) OFFSET_OF (type, member) // // Basic types from EFI Application Toolkit required to buiild Open SSL -- cgit v1.2.3