mac: clean-up obsolete conditional code based on old SDK

Change-Id: Ie2d476780a48b5815961598e214343d5def962c1

9 files changed, 5 insertions, 99 deletions

diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk
index 6a97e69cc691..f0108e5fcb77 100644
--- a/avmedia/Module_avmedia.mk
+++ b/avmedia/Module_avmedia.mk
@@ -44,14 +44,10 @@ endif
 endif
 
 ifeq ($(OS),MACOSX)
-ifneq (1050,$(MACOSX_SDK_VERSION))
-ifneq (1060,$(MACOSX_SDK_VERSION))
 $(eval $(call gb_Module_add_targets,avmedia,\
 	Library_avmediaMacAVF \
 ))
 endif
-endif
-endif
 
 ifneq ($(ENABLE_DIRECTX),)
 $(eval $(call gb_Module_add_targets,avmedia,\
diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
index adbddd7cf1cb..75fdbc7b9b6b 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
@@ -27,13 +27,6 @@
 
 #include <dlfcn.h>
 
-// MacOSX10.4u.sdk/usr/include/c++/4.0.0/cxxabi.h defined
-// __cxxabiv1::__class_type_info and __cxxabiv1::__si_class_type_info but
-// MacOSX10.7.sdk/usr/include/cxxabi.h no longer does:
-#if MACOSX_SDK_VERSION < 1070
-#include <cxxabi.h>
-#endif
-
 #include "boost/static_assert.hpp"
 #include "boost/unordered_map.hpp"
 #include "com/sun/star/uno/RuntimeException.hpp"
@@ -61,31 +54,16 @@ struct Fake_type_info {
 
 struct Fake_class_type_info: Fake_type_info {};
 
-#if MACOSX_SDK_VERSION < 1070
-BOOST_STATIC_ASSERT(
-    sizeof (Fake_class_type_info) == sizeof (__cxxabiv1::__class_type_info));
-#endif
-
 struct Fake_si_class_type_info: Fake_class_type_info {
     void const * base;
 };
 
-#if MACOSX_SDK_VERSION < 1070
-BOOST_STATIC_ASSERT(
-    sizeof (Fake_si_class_type_info)
-    == sizeof (__cxxabiv1::__si_class_type_info));
-#endif
-
 struct Base {};
 struct Derived: Base {};
 
 std::type_info * createFake_class_type_info(char const * name) {
     char * buf = new char[sizeof (Fake_class_type_info)];
-#if MACOSX_SDK_VERSION < 1070
-    assert(
-        dynamic_cast<__cxxabiv1::__class_type_info const *>(&typeid(Base))
-        != 0);
-#endif
+
     *reinterpret_cast<void **>(buf) = *reinterpret_cast<void * const *>(
         &typeid(Base));
         // copy __cxxabiv1::__class_type_info vtable into place
@@ -99,11 +77,7 @@ std::type_info * createFake_si_class_type_info(
     char const * name, std::type_info const * base)
 {
     char * buf = new char[sizeof (Fake_si_class_type_info)];
-#if MACOSX_SDK_VERSION < 1070
-    assert(
-        dynamic_cast<__cxxabiv1::__si_class_type_info const *>(&typeid(Derived))
-        != 0);
-#endif
+
     *reinterpret_cast<void **>(buf) = *reinterpret_cast<void * const *>(
         &typeid(Derived));
         // copy __cxxabiv1::__si_class_type_info vtable into place
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
index 83b06c5161f3..f224c22b57cf 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
@@ -27,13 +27,6 @@
 
 #include <dlfcn.h>
 
-// MacOSX10.4u.sdk/usr/include/c++/4.0.0/cxxabi.h defined
-// __cxxabiv1::__class_type_info and __cxxabiv1::__si_class_type_info but
-// MacOSX10.7.sdk/usr/include/cxxabi.h no longer does:
-#if MACOSX_SDK_VERSION < 1070
-#include <cxxabi.h>
-#endif
-
 #include "boost/static_assert.hpp"
 #include "boost/unordered_map.hpp"
 #include "com/sun/star/uno/RuntimeException.hpp"
@@ -63,32 +56,17 @@ struct Fake_class_type_info: Fake_type_info {
     virtual ~Fake_class_type_info() SAL_DELETED_FUNCTION;
 };
 
-#if MACOSX_SDK_VERSION < 1070
-BOOST_STATIC_ASSERT(
-    sizeof (Fake_class_type_info) == sizeof (__cxxabiv1::__class_type_info));
-#endif
-
 struct Fake_si_class_type_info: Fake_class_type_info {
     virtual ~Fake_si_class_type_info() SAL_DELETED_FUNCTION;
     void const * base;
 };
 
-#if MACOSX_SDK_VERSION < 1070
-BOOST_STATIC_ASSERT(
-    sizeof (Fake_si_class_type_info)
-    == sizeof (__cxxabiv1::__si_class_type_info));
-#endif
-
 struct Base {};
 struct Derived: Base {};
 
 std::type_info * createFake_class_type_info(char const * name) {
     char * buf = new char[sizeof (Fake_class_type_info)];
-#if MACOSX_SDK_VERSION < 1070
-    assert(
-        dynamic_cast<__cxxabiv1::__class_type_info const *>(&typeid(Base))
-        != 0);
-#endif
+
     *reinterpret_cast<void **>(buf) = *reinterpret_cast<void * const *>(
         &typeid(Base));
         // copy __cxxabiv1::__class_type_info vtable into place
@@ -102,11 +80,7 @@ std::type_info * createFake_si_class_type_info(
     char const * name, std::type_info const * base)
 {
     char * buf = new char[sizeof (Fake_si_class_type_info)];
-#if MACOSX_SDK_VERSION < 1070
-    assert(
-        dynamic_cast<__cxxabiv1::__si_class_type_info const *>(&typeid(Derived))
-        != 0);
-#endif
+
     *reinterpret_cast<void **>(buf) = *reinterpret_cast<void * const *>(
         &typeid(Derived));
         // copy __cxxabiv1::__si_class_type_info vtable into place
diff --git a/external/libmariadb/configs/mac_my_config.h b/external/libmariadb/configs/mac_my_config.h
index 38db37e3cef9..766c757c27e5 100644
--- a/external/libmariadb/configs/mac_my_config.h
+++ b/external/libmariadb/configs/mac_my_config.h
@@ -140,9 +140,7 @@
 #define HAVE_STPCPY 1
 #define HAVE_STRERROR 1
 #define HAVE_STRLCPY 1
-#if MACOSX_SDK_VERSION >= 1070
 #define HAVE_STRNLEN 1
-#endif
 #define HAVE_STRPBRK 1
 #define HAVE_STRSEP 1
 #define HAVE_STRSTR 1
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index b88e76378a84..1e84bd4159fd 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -124,9 +124,7 @@ $(eval $(call gb_Rdb_add_components,services,\
 	writerperfect/source/writer/wpftwriter \
 	writerperfect/source/calc/wpftcalc \
 	$(if $(filter MACOSX,$(OS)), \
-		$(if $(filter 1050 1060,$(MACOSX_SDK_VERSION)),, \
-			$(call gb_Helper_optional,AVMEDIA,avmedia/source/macavf/avmediaMacAVF) \
-		) \
+		$(call gb_Helper_optional,AVMEDIA,avmedia/source/macavf/avmediaMacAVF) \
 		$(if $(filter TRUE,$(ENABLE_MACOSX_SANDBOX)),, \
 			$(call gb_Helper_optional,AVMEDIA,avmedia/source/quicktime/avmediaQuickTime) \
 		) \
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 3d407300cc60..6501b0a82814 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -61,19 +61,6 @@ gb_CXXFLAGS := \
 	#-Wshadow \ break in compiler headers already
 	#-fsigned-char \ might be removed?
 
-# Without this I get struct/class clashes for "complex" when compiling
-# some source files in vcl, at least with the 10.7 SDK.
-ifneq ($(filter 1070,$(MACOSX_SDK_VERSION)),)
-gb_COMPILERDEFS += \
-		-DBOOST_DETAIL_NO_CONTAINER_FWD \
-
-endif
-
-ifneq ($(filter 1060,$(MACOSX_SDK_VERSION)),)
-gb_COMPILERNOOPTFLAGS := -O0 -fstrict-overflow
-
-endif
-
 ifeq ($(HAVE_GCC_NO_LONG_DOUBLE),TRUE)
 gb_CXXFLAGS += -Wno-long-double
 endif
diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index cc5cc06cd385..47129b9a9c04 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -880,12 +880,7 @@ Rectangle AquaSalMenu::GetMenuBarButtonRectPixel( sal_uInt16 i_nItemId, SalFrame
     if( ! pNSWin )
         return Rectangle();
 
-#if MACOSX_SDK_VERSION >= 1070
     NSRect aRect = [pNSWin convertRectToScreen:[pNSWin frame]];
-#else
-    NSRect aRect = [pNSWin frame];
-    aRect.origin = [pNSWin convertBaseToScreen: NSMakePoint( 0, 0 )];
-#endif
 
     // make coordinates relative to reference frame
     static_cast<AquaSalFrame*>(i_pReferenceFrame)->CocoaToVCL( aRect.origin );
diff --git a/vcl/quartz/CTRunData.hxx b/vcl/quartz/CTRunData.hxx
index b6d1a1d86188..40c2a0a5ddd3 100644
--- a/vcl/quartz/CTRunData.hxx
+++ b/vcl/quartz/CTRunData.hxx
@@ -10,20 +10,8 @@
 #define CTRunData_Included
 
 #include "premac.h"
-#if defined(MACOSX) && MACOSX_SDK_VERSION < 1080
-#include <ApplicationServices/ApplicationServices.h>
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
-// The following symbols are SPI (System Programming Interface) in 10.5
-extern "C" {
-    void CTRunGetAdvances(CTRunRef run, CFRange range, CGSize buffer[]);
-    const CGSize* CTRunGetAdvancesPtr(CTRunRef run);
-    extern const CFStringRef kCTTypesetterOptionForcedEmbeddingLevel;
-}
-#endif
-#else
 #include <CoreGraphics/CoreGraphics.h>
 #include <CoreText/CoreText.h>
-#endif
 #include "postmac.h"
 
 class CTRunData
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index 38cf249cfaf2..8a06d3b7dd10 100644
--- a/vcl/quartz/ctfonts.cxx
+++ b/vcl/quartz/ctfonts.cxx
@@ -249,11 +249,7 @@ int CoreTextFontData::GetFontTable( const char pTagName[5], unsigned char* pResu
     // get the raw table length
     CTFontDescriptorRef pFontDesc = reinterpret_cast<CTFontDescriptorRef>( GetFontId());
     CTFontRef rCTFont = CTFontCreateWithFontDescriptor( pFontDesc, 0.0, NULL);
-#if defined(MACOSX) && MACOSX_SDK_VERSION < 1080
-    const uint32_t opts( kCTFontTableOptionExcludeSynthetic );
-#else
     const uint32_t opts( kCTFontTableOptionNoOptions );
-#endif
     CFDataRef pDataRef = CTFontCopyTable( rCTFont, nTagCode, opts);
     CFRelease( rCTFont);
     if( !pDataRef)