[Libreoffice-commits] .: 3 commits - apple_remote/inc apple_remote/RemoteMainController.m solenv/inc vcl/aqua

Tor Lillqvist tml at kemper.freedesktop.org
Mon Oct 3 07:09:08 PDT 2011 

 apple_remote/RemoteMainController.m         |    1 -
 apple_remote/inc/AppleRemote.h              |   10 ++++++++++
 apple_remote/inc/GlobalKeyboardDevice.h     |    5 ++---
 apple_remote/inc/HIDRemoteControlDevice.h   |    5 ++---
 apple_remote/inc/KeyspanFrontRowControl.h   |   10 ++++++++++
 apple_remote/inc/MultiClickRemoteBehavior.h |    1 -
 apple_remote/inc/RemoteControl.h            |   10 ++++++++++
 apple_remote/inc/RemoteControlContainer.h   |    1 -
 apple_remote/inc/RemoteMainController.h     |   10 ++++++++++
 solenv/inc/premac.h                         |    7 +++++++
 vcl/aqua/source/window/salframeview.mm      |    5 ++---
 11 files changed, 53 insertions(+), 12 deletions(-)

New commits:
commit 84e2f8ff43f2b59cd93a7df9ededdffa8bb87ef5
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Oct 3 16:52:50 2011 +0300

    Workaround for building against MacOSX 10.6 SDK but with 10.4 as the highest used API

diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm
index 54ebe80..6f451f5 100644
--- a/vcl/aqua/source/window/salframeview.mm
+++ b/vcl/aqua/source/window/salframeview.mm
@@ -1597,11 +1597,10 @@ private:
     return 0;
 }
 
-#if defined(MAC_OS_X_VERSION_10_5) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5)
-/* build target 10.5 or greater */
+#if defined(MAC_OS_X_VERSION_10_5)
+/* SDK 10.5 or greater, even if MAC_OS_X_VERSION_MAX_ALLOWED might be less than 10.5 */
 - (NSInteger)conversationIdentifier
 #else
-/* build target 10.4 */ 
 - (long)conversationIdentifier
 #endif
 {
commit e5c80a1f1c527196f29041290328e988cd80475b
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Oct 3 16:13:20 2011 +0300

    Workaround for building against MacOSX 10.6 SDK but with 10.4 as the highest used API

diff --git a/apple_remote/RemoteMainController.m b/apple_remote/RemoteMainController.m
index 5b3b893..e884e4e 100644
--- a/apple_remote/RemoteMainController.m
+++ b/apple_remote/RemoteMainController.m
@@ -174,4 +174,4 @@
 	return remoteControlBehavior;
 }
 
- at end
\ No newline at end of file
+ at end
diff --git a/apple_remote/inc/AppleRemote.h b/apple_remote/inc/AppleRemote.h
index aeb32f9..509ddaa 100644
--- a/apple_remote/inc/AppleRemote.h
+++ b/apple_remote/inc/AppleRemote.h
@@ -28,6 +28,16 @@
  *
  *****************************************************************************/
 
+#ifndef DID_DEFINE_SOME_FUTURE_TYPES
+#import <Foundation/NSObjCRuntime.h>
+#if defined (NSFoundationVersionNumber10_5) &&  MAC_OS_X_VERSION_MAX_ALLOWED < 1050
+ at class CALayer;
+ at class NSViewController;
+typedef int NSColorRenderingIntent;
+#define DID_DEFINE_SOME_FUTURE_TYPES
+#endif
+#endif
+
 #import <Cocoa/Cocoa.h>
 #import "HIDRemoteControlDevice.h"
 
diff --git a/apple_remote/inc/GlobalKeyboardDevice.h b/apple_remote/inc/GlobalKeyboardDevice.h
index 8e2aede..ad9c4f3 100644
--- a/apple_remote/inc/GlobalKeyboardDevice.h
+++ b/apple_remote/inc/GlobalKeyboardDevice.h
@@ -28,11 +28,10 @@
  *
  *****************************************************************************/
 
-#import <Cocoa/Cocoa.h>
-#import <Carbon/Carbon.h>
-
 #import "RemoteControl.h"
 
+#import <Carbon/Carbon.h>
+
 
 /*
  This class registers for a number of global keyboard shortcuts to simulate a remote control
diff --git a/apple_remote/inc/HIDRemoteControlDevice.h b/apple_remote/inc/HIDRemoteControlDevice.h
index 622441f..44e4d17 100644
--- a/apple_remote/inc/HIDRemoteControlDevice.h
+++ b/apple_remote/inc/HIDRemoteControlDevice.h
@@ -28,11 +28,10 @@
  *
  *****************************************************************************/
 
-#import <Cocoa/Cocoa.h>
-#import <IOKit/hid/IOHIDLib.h>
-
 #import "RemoteControl.h"
 
+#import <IOKit/hid/IOHIDLib.h>
+
 /*
     Base class for HID based remote control devices
  */
diff --git a/apple_remote/inc/KeyspanFrontRowControl.h b/apple_remote/inc/KeyspanFrontRowControl.h
index a67ce4a..2469b58 100644
--- a/apple_remote/inc/KeyspanFrontRowControl.h
+++ b/apple_remote/inc/KeyspanFrontRowControl.h
@@ -29,6 +29,16 @@
  *****************************************************************************/
 
 
+#ifndef DID_DEFINE_SOME_FUTURE_TYPES
+#import <Foundation/NSObjCRuntime.h>
+#if defined (NSFoundationVersionNumber10_5) &&  MAC_OS_X_VERSION_MAX_ALLOWED < 1050
+ at class CALayer;
+ at class NSViewController;
+typedef int NSColorRenderingIntent;
+#define DID_DEFINE_SOME_FUTURE_TYPES
+#endif
+#endif
+
 #import <Cocoa/Cocoa.h>
 #import "HIDRemoteControlDevice.h"
 
diff --git a/apple_remote/inc/MultiClickRemoteBehavior.h b/apple_remote/inc/MultiClickRemoteBehavior.h
index 9cffa35..a704feb 100644
--- a/apple_remote/inc/MultiClickRemoteBehavior.h
+++ b/apple_remote/inc/MultiClickRemoteBehavior.h
@@ -29,7 +29,6 @@
  *****************************************************************************/
 
 
-#import <Cocoa/Cocoa.h>
 #import "RemoteControl.h"
 
 /**
diff --git a/apple_remote/inc/RemoteControl.h b/apple_remote/inc/RemoteControl.h
index cbf8fd8..a39f53b 100644
--- a/apple_remote/inc/RemoteControl.h
+++ b/apple_remote/inc/RemoteControl.h
@@ -28,6 +28,16 @@
  *
  *****************************************************************************/
 
+#ifndef DID_DEFINE_SOME_FUTURE_TYPES
+#import <Foundation/NSObjCRuntime.h>
+#if defined (NSFoundationVersionNumber10_5) &&  MAC_OS_X_VERSION_MAX_ALLOWED < 1050
+ at class CALayer;
+ at class NSViewController;
+typedef int NSColorRenderingIntent;
+#define DID_DEFINE_SOME_FUTURE_TYPES
+#endif
+#endif
+
 #import <Cocoa/Cocoa.h>
 
 // notifaction names that are being used to signal that an application wants to
diff --git a/apple_remote/inc/RemoteControlContainer.h b/apple_remote/inc/RemoteControlContainer.h
index f6cd40b..e82fa6b 100644
--- a/apple_remote/inc/RemoteControlContainer.h
+++ b/apple_remote/inc/RemoteControlContainer.h
@@ -28,7 +28,6 @@
  *
  *****************************************************************************/
 
-#import <Cocoa/Cocoa.h>
 #import "RemoteControl.h"
 
 @interface RemoteControlContainer : RemoteControl {
diff --git a/apple_remote/inc/RemoteMainController.h b/apple_remote/inc/RemoteMainController.h
index 7143f1f..1674540 100644
--- a/apple_remote/inc/RemoteMainController.h
+++ b/apple_remote/inc/RemoteMainController.h
@@ -28,6 +28,16 @@
  *
  *****************************************************************************/
 
+#ifndef DID_DEFINE_SOME_FUTURE_TYPES
+#import <Foundation/NSObjCRuntime.h>
+#if defined (NSFoundationVersionNumber10_5) &&  MAC_OS_X_VERSION_MAX_ALLOWED < 1050
+ at class CALayer;
+ at class NSViewController;
+typedef int NSColorRenderingIntent;
+#define DID_DEFINE_SOME_FUTURE_TYPES
+#endif
+#endif
+
 #import <Cocoa/Cocoa.h>
 
 #define AppleRemoteControlEvent 15
commit 0e9c5066a94bb75f6a8d3ea4c2bad447e3a26a1f
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Oct 3 15:21:55 2011 +0300

    Fix build against the MacOSX 10.6 SDK but with 10.4 as the highest used API

diff --git a/solenv/inc/premac.h b/solenv/inc/premac.h
index f6e3747..c60c42c 100644
--- a/solenv/inc/premac.h
+++ b/solenv/inc/premac.h
@@ -47,4 +47,11 @@
 #define StringPtr MacOSStringPtr
 #define TimeValue MacOSTimeValue
 
+#import <Foundation/NSObjCRuntime.h>
+#if defined (NSFoundationVersionNumber10_5) &&  MAC_OS_X_VERSION_MAX_ALLOWED < 1050
+ at class CALayer;
+ at class NSViewController;
+typedef int NSColorRenderingIntent;
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

More information about the Libreoffice-commits mailing list