diff options
| author | Marshall Clow <mclow@qualcomm.com> | 2013-03-18 17:45:34 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow@qualcomm.com> | 2013-03-18 17:45:34 +0000 |
| commit | b56e8587aff9d8766a673f51b2d9c525e1535d84 (patch) | |
| tree | c4c634ec98a9e66df29d6d01254590677ba20b85 /libcxx/src | |
| parent | e8f1cf478bc7bd8d6e7088a6e4c97d32ae6002c6 (diff) | |
| download | bcm5719-llvm-b56e8587aff9d8766a673f51b2d9c525e1535d84.tar.gz bcm5719-llvm-b56e8587aff9d8766a673f51b2d9c525e1535d84.zip | |
Removed raw references to __APPLE__; now just check to see if it is defined.
llvm-svn: 177297
Diffstat (limited to 'libcxx/src')
| -rw-r--r-- | libcxx/src/chrono.cpp | 4 | ||||
| -rw-r--r-- | libcxx/src/exception.cpp | 4 | ||||
| -rw-r--r-- | libcxx/src/new.cpp | 2 | ||||
| -rw-r--r-- | libcxx/src/stdexcept.cpp | 2 | ||||
| -rw-r--r-- | libcxx/src/typeinfo.cpp | 4 |
5 files changed, 8 insertions, 8 deletions
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(); } |
