Removed raw references to __APPLE__; now just check to see if it is defined.

llvm-svn: 177297

10 files changed, 16 insertions, 16 deletions

diff --git a/libcxx/include/__locale b/libcxx/include/__locale
index 1c093f69a8e..6f6a97b993d 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__ || __APPLE__ || __FreeBSD__ || __sun__)
+#elif (__GLIBC__ || defined(__APPLE__) || __FreeBSD__ || __sun__)
 # include <xlocale.h>
 #endif  // _WIN32 || __GLIBC__ || __APPLE__ || __FreeBSD_
 
diff --git a/libcxx/include/iterator b/libcxx/include/iterator
index 59e33900de9..3b078a2a214 100644
--- a/libcxx/include/iterator
+++ b/libcxx/include/iterator
@@ -317,7 +317,7 @@ template <class T, size_t N> T* end(T (&array)[N]);
 #include <type_traits>
 #include <cstddef>
 #include <iosfwd>
-#if __APPLE__
+#ifdef __APPLE__
 #include <Availability.h>
 #endif
 
diff --git a/libcxx/include/locale b/libcxx/include/locale
index a6f2e35bc29..0d8fba0b2bf 100644
--- a/libcxx/include/locale
+++ b/libcxx/include/locale
@@ -181,7 +181,7 @@ template <class charT> class messages_byname;
 #include <streambuf>
 #include <iterator>
 #include <limits>
-#if !__APPLE__
+#ifndef __APPLE__
 #include <cstdarg>
 #endif
 #include <cstdlib>
@@ -192,7 +192,7 @@ template <class charT> class messages_byname;
 #include <nl_types.h>
 #endif  // !_WIN32
 
-#if __APPLE__
+#ifdef __APPLE__
 #include <Availability.h>
 #endif
 
@@ -204,7 +204,7 @@ template <class charT> class messages_byname;
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
-#if __APPLE__ || __FreeBSD__
+#if defined(__APPLE__) || __FreeBSD__
 #  define _LIBCPP_GET_C_LOCALE 0
 #else
 #  define _LIBCPP_GET_C_LOCALE __cloc()
diff --git a/libcxx/src/chrono.cpp b/libcxx/src/chrono.cpp
index 1ce2e2807a3..15a6f466a77 100644
--- a/libcxx/src/chrono.cpp
+++ b/libcxx/src/chrono.cpp
@@ -9,7 +9,7 @@
 
 #include "chrono"
 #include <sys/time.h>        //for gettimeofday and timeval
-#if __APPLE__
+#ifdef __APPLE__
 #include <mach/mach_time.h>  // mach_absolute_time, mach_timebase_info_data_t
 #else  /* !__APPLE__ */
 #include <cerrno>  // errno
@@ -50,7 +50,7 @@ system_clock::from_time_t(time_t t) _NOEXCEPT
 
 const bool steady_clock::is_steady;
 
-#if __APPLE__
+#ifdef __APPLE__
 //   mach_absolute_time() * MachInfo.numer / MachInfo.denom is the number of
 //   nanoseconds since the computer booted up.  MachInfo.numer and MachInfo.denom
 //   are run time constants supplied by the OS.  This clock has no relationship
diff --git a/libcxx/src/exception.cpp b/libcxx/src/exception.cpp
index 0cd182b716c..7db304d8c31 100644
--- a/libcxx/src/exception.cpp
+++ b/libcxx/src/exception.cpp
@@ -14,7 +14,7 @@
 #define __has_include(inc) 0
 #endif
 
-#if __APPLE__
+#ifdef __APPLE__
   #include <cxxabi.h>
 
   using namespace __cxxabiv1;
@@ -102,7 +102,7 @@ terminate() _NOEXCEPT
 #if !defined(LIBCXXRT) && !defined(__GLIBCXX__)
 bool uncaught_exception() _NOEXCEPT
 {
-#if __APPLE__ || defined(_LIBCPPABI_VERSION)
+#if defined(__APPLE__) || defined(_LIBCPPABI_VERSION)
     // on Darwin, there is a helper function so __cxa_get_globals is private
     return __cxa_uncaught_exception();
 #else  // __APPLE__
diff --git a/libcxx/src/new.cpp b/libcxx/src/new.cpp
index 3ad593a3c0e..b23a516ff37 100644
--- a/libcxx/src/new.cpp
+++ b/libcxx/src/new.cpp
@@ -15,7 +15,7 @@
 #define __has_include(inc) 0
 #endif
 
-#if __APPLE__
+#ifdef __APPLE__
     #include <cxxabi.h>
 
     #ifndef _LIBCPPABI_VERSION
diff --git a/libcxx/src/stdexcept.cpp b/libcxx/src/stdexcept.cpp
index 660ebfe2735..0c4e8323abf 100644
--- a/libcxx/src/stdexcept.cpp
+++ b/libcxx/src/stdexcept.cpp
@@ -20,7 +20,7 @@
 #define __has_include(inc) 0
 #endif
 
-#if __APPLE__
+#ifdef __APPLE__
 #include <cxxabi.h>
 #elif defined(LIBCXXRT) || __has_include(<cxxabi.h>)
 #include <cxxabi.h>
diff --git a/libcxx/src/typeinfo.cpp b/libcxx/src/typeinfo.cpp
index 6bab0771f42..7b47d74123d 100644
--- a/libcxx/src/typeinfo.cpp
+++ b/libcxx/src/typeinfo.cpp
@@ -12,7 +12,7 @@
 #define __has_include(inc) 0
 #endif
 
-#if __APPLE__
+#ifdef __APPLE__
 #include <cxxabi.h>
 #elif defined(LIBCXXRT) || __has_include(<cxxabi.h>)
 #include <cxxabi.h>
@@ -50,7 +50,7 @@ std::bad_typeid::what() const _NOEXCEPT
   return "std::bad_typeid";
 }
 
-#if __APPLE__
+#ifdef __APPLE__
   // On Darwin, the cxa_bad_* functions cannot be in the lower level library
   // because bad_cast and bad_typeid are defined in his higher level library
   void __cxxabiv1::__cxa_bad_typeid() { throw std::bad_typeid(); }
diff --git a/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp b/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp
index 7da56bbb27c..2010dca4c61 100644
--- a/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp
@@ -24413,7 +24413,7 @@ void test12()
     output_iterator<char*> iter;
     std::locale lc = std::locale::classic();
     std::locale lg(lc, new my_numpunct);
-#if __APPLE__
+#ifdef __APPLE__
 // This test is failing on FreeBSD, possibly due to different representations
 // of the floating point numbers.  
     const my_facet f(1);
diff --git a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp
index 6d58337afb9..973d3749ab5 100644
--- a/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp
+++ b/libcxx/test/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp
@@ -93,7 +93,7 @@ int main()
         assert(t.tm_hour == 23);
         assert(err == std::ios_base::eofbit);
     }
-#if __APPLE__
+#ifdef __APPLE__
     {
         const my_facet f("ru_RU", 1);
         const wchar_t in[] = L"\x441\x443\x431\x431\x43E\x442\x430"
@@ -128,7 +128,7 @@ int main()
         assert(t.tm_hour == 23);
         assert(err == std::ios_base::eofbit);
     }
-#if __APPLE__
+#ifdef __APPLE__
     {
         const my_facet f("zh_CN", 1);
         const wchar_t in[] = L"\x516D"