[libcxx-commits] [libcxx] 61f9ec5 - [libcxx] [test] Fix the nasty_macros test on Windows on ARM/ARM64

[Martin Storsjö via libcxx-commits]

Author: Martin Storsjö
Date: 2022-05-09T12:46:41+03:00
New Revision: 61f9ec5e61a9306ccaca24d562cdc1584c19909b

URL: https://github.com/llvm/llvm-project/commit/61f9ec5e61a9306ccaca24d562cdc1584c19909b
DIFF: https://github.com/llvm/llvm-project/commit/61f9ec5e61a9306ccaca24d562cdc1584c19909b.diff

LOG: [libcxx] [test] Fix the nasty_macros test on Windows on ARM/ARM64

This isn't a configuration that we unfortunately can add to
the CI practically at the moment, but I do run the tests
sporadically offline in this configuration.

Differential Revision: https://reviews.llvm.org/D124993

Added: 
    

Modified: 
    libcxx/test/libcxx/nasty_macros.compile.pass.cpp

Removed: 
    


################################################################################
diff  --git a/libcxx/test/libcxx/nasty_macros.compile.pass.cpp b/libcxx/test/libcxx/nasty_macros.compile.pass.cpp
index d9162c1bca42b..9684df18ee318 100644
--- a/libcxx/test/libcxx/nasty_macros.compile.pass.cpp
+++ b/libcxx/test/libcxx/nasty_macros.compile.pass.cpp
@@ -108,7 +108,10 @@
 #define C NASTY_MACRO
 #define Cp NASTY_MACRO
 #define Cs NASTY_MACRO
-#define D NASTY_MACRO
+// Windows setjmp.h contains a struct member named 'D' on ARM/AArch64.
+#ifndef _WIN32
+# define D NASTY_MACRO
+#endif
 #define Dp NASTY_MACRO
 #define Ds NASTY_MACRO
 #define E NASTY_MACRO