[libcxx-commits] [PATCH] D124993: [libcxx] [test] Fix the nasty_macros test on Windows on ARM/ARM64

[Martin Storsjö via Phabricator via libcxx-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rG61f9ec5e61a9: [libcxx] [test] Fix the nasty_macros test on Windows on ARM/ARM64 (authored by mstorsjo).

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D124993/new/

https://reviews.llvm.org/D124993

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


Index: libcxx/test/libcxx/nasty_macros.compile.pass.cpp
===================================================================
--- libcxx/test/libcxx/nasty_macros.compile.pass.cpp
+++ 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


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D124993.428019.patch
Type: text/x-patch
Size: 536 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20220509/58655991/attachment.bin>