Kaydet (Commit) 29c6b314 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Check MACOSX_SDK_VERSION, not MAC_OS_X_VERSION_MIN_REQUIRED

Change-Id: Ie0b0ec3120f828e02b1ba9c21710c28159e7cd3c
üst 9ded9696
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include <stdio.h> #include <stdio.h>
#include <dlfcn.h> #include <dlfcn.h>
#if MAC_OS_X_VERSION_MIN_REQUIRED < 1070 #if MACOSX_SDK_VERSION < 1070
#include <cxxabi.h> #include <cxxabi.h>
#else #else
#include <typeinfo> #include <typeinfo>
...@@ -54,14 +54,14 @@ using namespace ::std; ...@@ -54,14 +54,14 @@ using namespace ::std;
using namespace ::osl; using namespace ::osl;
using namespace ::rtl; using namespace ::rtl;
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
#if MAC_OS_X_VERSION_MIN_REQUIRED < 1070 #if MACOSX_SDK_VERSION < 1070
using namespace ::__cxxabiv1; using namespace ::__cxxabiv1;
#endif #endif
namespace CPPU_CURRENT_NAMESPACE 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 // MacOSX10.4u.sdk/usr/include/c++/4.0.0/cxxabi.h defined
// __cxxabiv1::__class_type_info and __cxxabiv1::__si_class_type_info but // __cxxabiv1::__class_type_info and __cxxabiv1::__si_class_type_info but
...@@ -234,7 +234,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR ...@@ -234,7 +234,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
// ensure availability of base // ensure availability of base
type_info * base_rtti = getRTTI( type_info * base_rtti = getRTTI(
(typelib_CompoundTypeDescription *)pTypeDescr->pBaseTypeDescription ); (typelib_CompoundTypeDescription *)pTypeDescr->pBaseTypeDescription );
#if MAC_OS_X_VERSION_MIN_REQUIRED < 1070 #if MACOSX_SDK_VERSION < 1070
rtti = new __si_class_type_info( rtti = new __si_class_type_info(
strdup( rttiName ), (__class_type_info *)base_rtti ); strdup( rttiName ), (__class_type_info *)base_rtti );
#else #else
...@@ -245,7 +245,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR ...@@ -245,7 +245,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR
else else
{ {
// this class has no base class // 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 ) ); rtti = new __class_type_info( strdup( rttiName ) );
#else #else
rtti = create_FAKE_class_type_info( strdup( rttiName ) ); rtti = create_FAKE_class_type_info( strdup( rttiName ) );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment