From 69e76f80e28fc969631a6b191f394c8ffc1618b1 Mon Sep 17 00:00:00 2001
From: Marshall Clow <mclow@qualcomm.com>
Date: Mon, 18 Mar 2013 19:34:07 +0000
Subject: [PATCH] Removed raw references to __sun__, __FreeBSD__, __GLIBC__ and
 __linux__; now just check to see if they are defined.

llvm-svn: 177310
---
 libcxx/include/__config | 10 +++++-----
 libcxx/include/__locale | 12 ++++++------
 libcxx/include/locale   |  2 +-
 libcxx/src/thread.cpp   |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/libcxx/include/__config b/libcxx/include/__config
index 4c51bd0b..959390d 100644
--- a/libcxx/include/__config
+++ b/libcxx/include/__config
@@ -272,7 +272,7 @@ typedef __char32_t char32_t;
 #define _LIBCPP_HAS_NO_CONSTEXPR
 #endif
 
-#if __FreeBSD__ && (__ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L)
+#if defined(__FreeBSD__) && (__ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L)
 #define _LIBCPP_HAS_QUICK_EXIT
 #define _LIBCPP_HAS_C11_FEATURES
 #endif
@@ -451,18 +451,18 @@ template <unsigned> struct __static_assert_check {};
 #define _LIBCPP_EXTERN_TEMPLATE(...) extern template __VA_ARGS__;
 #endif
 
-#if defined(__APPLE__) || __FreeBSD__ || _WIN32 || __sun__
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(_WIN32) || defined(__sun__)
 #define _LIBCPP_LOCALE__L_EXTENSIONS 1
 #endif
-#if __FreeBSD__
+#ifdef __FreeBSD__
 #define _DECLARE_C99_LDBL_MATH 1
 #endif
 
-#if defined(__APPLE__) || __FreeBSD__
+#if defined(__APPLE__) || defined(__FreeBSD__)
 #define _LIBCPP_HAS_DEFAULTRUNELOCALE
 #endif
 
-#if defined(__APPLE__) || __FreeBSD__ || __sun__
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__sun__)
 #define _LIBCPP_WCTYPE_IS_MASK
 #endif
 
diff --git a/libcxx/include/__locale b/libcxx/include/__locale
index 6f6a97b..15102be 100644
--- a/libcxx/include/__locale
+++ b/libcxx/include/__locale
@@ -21,7 +21,7 @@
 #include <locale.h>
 #ifdef _WIN32
 # include <support/win32/locale_win32.h>
-#elif (__GLIBC__ || defined(__APPLE__) || __FreeBSD__ || __sun__)
+#elif (defined(__GLIBC__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__sun__))
 # include <xlocale.h>
 #endif  // _WIN32 || __GLIBC__ || __APPLE__ || __FreeBSD_
 
@@ -315,7 +315,7 @@ locale::operator()(const basic_string<_CharT, _Traits, _Allocator>& __x,
 class _LIBCPP_TYPE_VIS ctype_base
 {
 public:
-#if __GLIBC__
+#ifdef __GLIBC__
     typedef unsigned short mask;
     static const mask space  = _ISspace;
     static const mask print  = _ISprint;
@@ -339,10 +339,10 @@ public:
     static const mask punct  = _PUNCT;
     static const mask xdigit = _HEX;
     static const mask blank  = _BLANK;
-#elif (__APPLE__ || __FreeBSD__)
-#if __APPLE__
+#elif (defined(__APPLE__) || defined(__FreeBSD__))
+#ifdef __APPLE__
     typedef __uint32_t mask;
-#elif __FreeBSD__
+#elif defined(__FreeBSD__)
     typedef unsigned long mask;
 #endif
     static const mask space  = _CTYPE_S;
@@ -355,7 +355,7 @@ public:
     static const mask punct  = _CTYPE_P;
     static const mask xdigit = _CTYPE_X;
     static const mask blank  = _CTYPE_B;
-#elif __sun__
+#elif defined(__sun__)
     typedef unsigned int mask;
     static const mask space  = _ISSPACE;
     static const mask print  = _ISPRINT;
diff --git a/libcxx/include/locale b/libcxx/include/locale
index 0d8fba0..662b980 100644
--- a/libcxx/include/locale
+++ b/libcxx/include/locale
@@ -204,7 +204,7 @@ template <class charT> class messages_byname;
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
-#if defined(__APPLE__) || __FreeBSD__
+#if defined(__APPLE__) || defined(__FreeBSD__)
 #  define _LIBCPP_GET_C_LOCALE 0
 #else
 #  define _LIBCPP_GET_C_LOCALE __cloc()
diff --git a/libcxx/src/thread.cpp b/libcxx/src/thread.cpp
index 1acb131..7a06b29 100644
--- a/libcxx/src/thread.cpp
+++ b/libcxx/src/thread.cpp
@@ -14,7 +14,7 @@
 #include "limits"
 #include <sys/types.h>
 #if !defined(_WIN32)
-#if !__sun__ && !__linux__
+#if !defined(__sun__) && !defined(__linux__)
 #include <sys/sysctl.h>
 #else
 #include <unistd.h>
-- 
2.7.4