diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-07-23 17:12:27 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-07-28 09:07:27 +0300 |
| commit | 29c6b31442754b4cbbf0e326f2f96530c5e724a5 (patch) | |
| tree | a223e26ca12877a4c7670419a6bd0a001eaeece8 /bridges | |
| parent | 9ded9696859283dd63665951c9e7cc1f7f2d92f0 (diff) | |
Check MACOSX_SDK_VERSION, not MAC_OS_X_VERSION_MIN_REQUIRED
Change-Id: Ie0b0ec3120f828e02b1ba9c21710c28159e7cd3c
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx index 52c202a89833..d39b194578aa 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx @@ -29,7 +29,7 @@ #include <stdio.h> #include <dlfcn.h> -#if MAC_OS_X_VERSION_MIN_REQUIRED < 1070 +#if MACOSX_SDK_VERSION < 1070 #include <cxxabi.h> #else #include <typeinfo> @@ -54,14 +54,14 @@ using namespace ::std; using namespace ::osl; using namespace ::rtl; using namespace ::com::sun::star::uno; -#if MAC_OS_X_VERSION_MIN_REQUIRED < 1070 +#if MACOSX_SDK_VERSION < 1070 using namespace ::__cxxabiv1; #endif namespace CPPU_CURRENT_NAMESPACE { -#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 +#if MACOSX_SDK_VERSION >= 1070 // MacOSX10.4u.sdk/usr/include/c++/4.0.0/cxxabi.h defined // __cxxabiv1::__class_type_info and __cxxabiv1::__si_class_type_info but @@ -234,7 +234,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR // ensure availability of base type_info * base_rtti = getRTTI( (typelib_CompoundTypeDescription *)pTypeDescr->pBaseTypeDescription ); -#if MAC_OS_X_VERSION_MIN_REQUIRED < 1070 +#if MACOSX_SDK_VERSION < 1070 rtti = new __si_class_type_info( strdup( rttiName ), (__class_type_info *)base_rtti ); #else @@ -245,7 +245,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR else { // this class has no base class -#if MAC_OS_X_VERSION_MIN_REQUIRED < 1070 +#if MACOSX_SDK_VERSION < 1070 rtti = new __class_type_info( strdup( rttiName ) ); #else rtti = create_FAKE_class_type_info( strdup( rttiName ) ); |