Skip to content

Commit 53edbd0

Browse files
committed
define _MSC_VER when preprocessing, add guards
1 parent 950b5bc commit 53edbd0

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

include/compat/cet.h

+7-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,13 @@
77
#define LIBCOMPAT_CET_H
88

99
#ifndef _MSC_VER
10-
#include_next <cet.h>
10+
11+
#ifdef __CET__
12+
# include_next <cet.h>
13+
#else
14+
# define _CET_ENDBR
15+
#endif
16+
1117
#endif
1218

1319
#endif

update.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ $CP crypto/compat/ui_openssl_win.c crypto/ui
186186
$GREP -v OPENSSL_ia32cap_P $libcrypto_src/Symbols.list | $GREP '^[A-Za-z0-9_]' > crypto/crypto.sym
187187

188188
fixup_masm() {
189-
cpp -I./crypto -I./include/compat $1 \
189+
cpp -I./crypto -I./include/compat -D_MSC_VER $1 \
190190
| sed -e 's/^#/;/' \
191191
| sed -e 's/|/OR/g' \
192192
| sed -e 's/~/NOT/g' \

0 commit comments

Comments
 (0)