diff options
| author | Hans Wennborg <hans@hanshq.net> | 2018-08-16 09:45:10 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2018-08-16 09:45:10 +0000 |
| commit | b2177de8bad70f4a4a9b7cbd9255a3daef6cb258 (patch) | |
| tree | 2c018c08e6e8ab1f007810b2d51d34a1740e7a08 /libcxx/test | |
| parent | 5dfcfbf90c28cd01f415697e84bd8d9e2678e36e (diff) | |
| download | bcm5719-llvm-b2177de8bad70f4a4a9b7cbd9255a3daef6cb258.tar.gz bcm5719-llvm-b2177de8bad70f4a4a9b7cbd9255a3daef6cb258.zip | |
Merging r339794:
------------------------------------------------------------------------
r339794 | dim | 2018-08-15 19:30:32 +0200 (Wed, 15 Aug 2018) | 8 lines
For FreeBSD, don't define _M in nasty_macros.hpp
Because FreeBSD uses _M in its <sys/types.h>, and it is hard to avoid
including that header, only define _M to NASTY_MACRO for other operating
systems. This fixes almost 2000 unexpected test failures.
Discussed with Eric Fiselier.
------------------------------------------------------------------------
llvm-svn: 339852
Diffstat (limited to 'libcxx/test')
| -rw-r--r-- | libcxx/test/support/nasty_macros.hpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libcxx/test/support/nasty_macros.hpp b/libcxx/test/support/nasty_macros.hpp index 76d8ab0e720..97a17bb689a 100644 --- a/libcxx/test/support/nasty_macros.hpp +++ b/libcxx/test/support/nasty_macros.hpp @@ -22,7 +22,11 @@ #define _J NASTY_MACRO #define _K NASTY_MACRO #define _L NASTY_MACRO +// Because FreeBSD uses _M in its <sys/types.h>, and it is hard to avoid +// including that header, only define _M for other operating systems. +#ifndef __FreeBSD__ #define _M NASTY_MACRO +#endif #define _N NASTY_MACRO #define _O NASTY_MACRO #define _P NASTY_MACRO |
