define _MSC_VER when preprocessing, add guards

2 files changed, 8 insertions, 2 deletions

diff --git a/include/compat/cet.h b/include/compat/cet.h
index 95517b0..bb845de 100644
--- a/include/compat/cet.h
+++ b/include/compat/cet.h
@@ -7,7 +7,13 @@
 #define LIBCOMPAT_CET_H
 
 #ifndef _MSC_VER
-#include_next <cet.h>
+
+#ifdef __CET__
+#   include_next <cet.h>
+#else
+#   define _CET_ENDBR
+#endif
+
 #endif
 
 #endif
diff --git a/update.sh b/update.sh
index e414f0d..08cac6f 100755
--- a/update.sh
+++ b/update.sh
@@ -186,7 +186,7 @@ $CP crypto/compat/ui_openssl_win.c crypto/ui
 $GREP -v OPENSSL_ia32cap_P $libcrypto_src/Symbols.list | $GREP '^[A-Za-z0-9_]' > crypto/crypto.sym
 
 fixup_masm() {
-        cpp -I./crypto -I./include/compat $1 \
+        cpp -I./crypto -I./include/compat -D_MSC_VER $1 \
                 | sed -e 's/^#/;/'    \
                 | sed -e 's/|/OR/g'   \
                 | sed -e 's/~/NOT/g'  \