From 29c6b31442754b4cbbf0e326f2f96530c5e724a5 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Mon, 23 Jul 2012 17:12:27 +0300
Subject: Check MACOSX_SDK_VERSION, not MAC_OS_X_VERSION_MIN_REQUIRED
Change-Id: Ie0b0ec3120f828e02b1ba9c21710c28159e7cd3c
---
bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
(limited to 'bridges')
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 ) );
--
cgit