[libcxx] r304352 - Guard against more macros in tchar.h

Eric Fiselier via cfe-commits cfe-commits at lists.llvm.org
Wed May 31 14:39:54 PDT 2017


Author: ericwf
Date: Wed May 31 16:39:54 2017
New Revision: 304352

URL: http://llvm.org/viewvc/llvm-project?rev=304352&view=rev
Log:
Guard against more macros in tchar.h

Modified:
    libcxx/trunk/test/support/nasty_macros.hpp

Modified: libcxx/trunk/test/support/nasty_macros.hpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/support/nasty_macros.hpp?rev=304352&r1=304351&r2=304352&view=diff
==============================================================================
--- libcxx/trunk/test/support/nasty_macros.hpp (original)
+++ libcxx/trunk/test/support/nasty_macros.hpp Wed May 31 16:39:54 2017
@@ -37,7 +37,13 @@
 #define _Y NASTY_MACRO
 #define _Z NASTY_MACRO
 
-#define _UI NASTY_MACRO // tchar.h defines this on Windows.
+// tchar.h defines these macros on Windows.
+#define _UI   NASTY_MACRO
+#define _PUC  NASTY_MACRO
+#define _CPUC NASTY_MACRO
+#define _PC   NASTY_MACRO
+#define _CRPC NASTY_MACRO
+#define _CPC  NASTY_MACRO
 
 // Test that libc++ doesn't use names reserved by WIN32 API Macros.
 // NOTE: Obviously we can only define these on non-windows platforms.




More information about the cfe-commits mailing list