diff options
| author | Eric Fiselier <eric@efcs.ca> | 2017-01-07 11:27:06 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2017-01-07 11:27:06 +0000 |
| commit | 5741d86d112047f839fade3547ada3afaf495b17 (patch) | |
| tree | 513f889e7c1024b4bd41283d96e6725846c8d6a5 /libcxx/test/support | |
| parent | f62eb6b29a9fecc1822853fdb393dbad60010560 (diff) | |
| download | bcm5719-llvm-5741d86d112047f839fade3547ada3afaf495b17.tar.gz bcm5719-llvm-5741d86d112047f839fade3547ada3afaf495b17.zip | |
Replace identifiers called `__out` because Windows.h #defines it.
Windows is greedy and it defines the identifier `__out` as a macro.
This patch renames all conflicting libc++ identifiers in order
to correctly work on Windows.
llvm-svn: 291345
Diffstat (limited to 'libcxx/test/support')
| -rw-r--r-- | libcxx/test/support/nasty_macros.hpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libcxx/test/support/nasty_macros.hpp b/libcxx/test/support/nasty_macros.hpp index 074853ea0b8..f6c8aaddbea 100644 --- a/libcxx/test/support/nasty_macros.hpp +++ b/libcxx/test/support/nasty_macros.hpp @@ -37,4 +37,11 @@ #define _Y NASTY_MACRO #define _Z 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. +#ifndef _WIN32 +#define __deallocate NASTY_MACRO +#define __out NASTY_MACRO +#endif + #endif // SUPPORT_NASTY_MACROS_HPP |
