diff -r 029d5efaaa6c -r b7c7428eaab9 src/hotspot/share/utilities/macros.hpp --- a/src/hotspot/share/utilities/macros.hpp Mon Oct 30 16:37:53 2017 +0100 +++ b/src/hotspot/share/utilities/macros.hpp Tue Oct 31 11:55:09 2017 -0400 @@ -322,7 +322,9 @@ #endif #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) +#ifndef BSD #define BSD +#endif // BSD defined in #define BSD_ONLY(code) code #define NOT_BSD(code) #else