summaryrefslogtreecommitdiff
path: root/Cryptlib/Include/openssl/opensslconf.h
diff options
context:
space:
mode:
authorGary Lin <glin@suse.com>2017-04-07 11:27:26 +0800
committerPeter Jones <pjones@redhat.com>2017-04-11 10:42:19 -0400
commit97469449fda5ba933a64280917e776487301a127 (patch)
tree50011e57cc67438db6c43376f83e6baa83a2752b /Cryptlib/Include/openssl/opensslconf.h
parente39692647f78e13d757ddbfdd36f440d5f526050 (diff)
downloadefi-boot-shim-97469449fda5ba933a64280917e776487301a127.tar.gz
efi-boot-shim-97469449fda5ba933a64280917e776487301a127.zip
Cryptlib: Include stddef.h in CrtLibSupport.h
The changes in the openssl headers cause the inclusion of CrtLibSupport.h eariler than the inclusion of stddef.h, so "offsetof" was defined twice and this caused the followling build error: In file included from Cryptlib/Include/openssl/buffer.h:23:0, from Cryptlib/Include/openssl/x509.h:22, from shim.c:56: /usr/lib64/gcc/x86_64-suse-linux/6/include/stddef.h:417:0: error: "offsetof" redefined [-Werror] #define offsetof(TYPE, MEMBER) __builtin_offsetof (TYPE, MEMBER) In file included from Cryptlib/Include/limits.h:15:0, from Cryptlib/Include/openssl/ossl_typ.h:13, from Cryptlib/Include/openssl/x509.h:20, from shim.c:56: Cryptlib/Include/CrtLibSupport.h:192:0: note: this is the location of the previous definition #define offsetof(type, member) ( (int) & ((type*)0) -> member ) We can lower the priority of the gcc include path or just remove the path, but this might cause problem since the path was introduced on purpose(*). Instead, including stddef.h first is more feasible. (*) https://github.com/rhinstaller/shim/commit/d51739a416400ad348d8a1c7e3886abce11fff1b Signed-off-by: Gary Lin <glin@suse.com>
Diffstat (limited to 'Cryptlib/Include/openssl/opensslconf.h')
0 files changed, 0 insertions, 0 deletions