diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-04-02 00:11:29 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-06-23 23:23:24 -0500 |
| commit | 2c506447fcf020b17797c30d001fda9c177a4235 (patch) | |
| tree | 9c2f2e789cbcd3c36f472bc438d241d388b6ddd1 | |
| parent | a95dbe7ad0bc8cf780bb9142bd9ffca3b0417d18 (diff) | |
WaE on Mac SDK > 10.4
Change-Id: Ie0e413a6beef87d399807f98f345103c82442a9c
| -rw-r--r-- | slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m | 7 | ||||
| -rw-r--r-- | vcl/aqua/source/window/salframeview.mm | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m b/slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m index 64af8150aed5..7d23b17f893a 100644 --- a/slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m +++ b/slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m @@ -81,12 +81,13 @@ typedef int NSColorRenderingIntent; - (void)prepareOpenGL { // for overriding to initialize OpenGL state, occurs after context creation -#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 - GLint swapInt = 1; -#else +#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 // init GL stuff here diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm index 86e3dc4d8549..02afa6cf822c 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; |