commit dde4bfe20ad0518a90c219160b3dc81743c1cd5c
author Marshall Clow <mclow@qualcomm.com> Mon Mar 18 17:45:34 2013 +0000
committer Marshall Clow <mclow@qualcomm.com> Mon Mar 18 17:45:34 2013 +0000
tree 95acecd203832272b935f47ddee4c5a4ccc3a452
parent 1f2573203c04ee747bebd2bf56a02186a35babcf

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

llvm-svn: 177297
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: b56e8587aff9d8766a673f51b2d9c525e1535d84

src/chrono.cpp

diff --git a/src/chrono.cpp b/src/chrono.cpp
index 1ce2e28..15a6f46 100644
--- a/src/chrono.cpp
+++ b/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 @@
 
 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

src/exception.cpp

diff --git a/src/exception.cpp b/src/exception.cpp
index 0cd182b..7db304d 100644
--- a/src/exception.cpp
+++ b/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 @@
 #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__

src/new.cpp

diff --git a/src/new.cpp b/src/new.cpp
index 3ad593a..b23a516 100644
--- a/src/new.cpp
+++ b/src/new.cpp
@@ -15,7 +15,7 @@
 #define __has_include(inc) 0
 #endif
 
-#if __APPLE__
+#ifdef __APPLE__
     #include <cxxabi.h>
 
     #ifndef _LIBCPPABI_VERSION

src/stdexcept.cpp

diff --git a/src/stdexcept.cpp b/src/stdexcept.cpp
index 660ebfe..0c4e832 100644
--- a/src/stdexcept.cpp
+++ b/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>

src/typeinfo.cpp

diff --git a/src/typeinfo.cpp b/src/typeinfo.cpp
index 6bab077..7b47d74 100644
--- a/src/typeinfo.cpp
+++ b/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 @@
   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(); }