summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2012-04-02 00:11:29 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2012-04-02 00:11:29 -0500
commite2a9584968c8329c976bc6518cfcc50cc728970b (patch)
tree662a7ff89cd86ec9037260b6032e2947ac0fd170
parent1f4a9f88d9031b520a034f19c20605a7a647dab7 (diff)
WaE with MAc SDK > 10.4
-rw-r--r--slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m5
-rw-r--r--vcl/aqua/source/window/salframeview.mm7
2 files changed, 8 insertions, 4 deletions
diff --git a/slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m b/slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m
index 44e4f6dde309..7d23b17f893a 100644
--- a/slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m
+++ b/slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m
@@ -81,7 +81,12 @@ typedef int NSColorRenderingIntent;
- (void)prepareOpenGL
{
// for overriding to initialize OpenGL state, occurs after context creation
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1050
long swapInt = 1;
+#else
+ NSInteger swapInt = 1;
+#endif
+
[[self openGLContext] setValues:&swapInt forParameter:NSOpenGLCPSwapInterval]; // set to vbl sync
diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm
index 3a97372e30ab..0946e08d68af 100644
--- a/vcl/aqua/source/window/salframeview.mm
+++ b/vcl/aqua/source/window/salframeview.mm
@@ -1595,11 +1595,10 @@ private:
return 0;
}
-#if defined (NSFoundationVersionNumber10_5)
-/* SDK 10.5 or greater, even if MAC_OS_X_VERSION_MAX_ALLOWED might be less than 10.5 */
-- (NSInteger)conversationIdentifier
-#else
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1050
- (long)conversationIdentifier
+#else
+- (NSInteger)conversationIdentifier
#endif
{
return (long)self;