diff options
| -rw-r--r-- | apple_remote/RemoteMainController.m | 2 | ||||
| -rw-r--r-- | apple_remote/inc/AppleRemote.h | 10 | ||||
| -rw-r--r-- | apple_remote/inc/GlobalKeyboardDevice.h | 5 | ||||
| -rw-r--r-- | apple_remote/inc/HIDRemoteControlDevice.h | 5 | ||||
| -rw-r--r-- | apple_remote/inc/KeyspanFrontRowControl.h | 10 | ||||
| -rw-r--r-- | apple_remote/inc/MultiClickRemoteBehavior.h | 1 | ||||
| -rw-r--r-- | apple_remote/inc/RemoteControl.h | 10 | ||||
| -rw-r--r-- | apple_remote/inc/RemoteControlContainer.h | 1 | ||||
| -rw-r--r-- | apple_remote/inc/RemoteMainController.h | 10 |
9 files changed, 45 insertions, 9 deletions
diff --git a/apple_remote/RemoteMainController.m b/apple_remote/RemoteMainController.m index 5b3b893adafc..e884e4e180b9 100644 --- a/apple_remote/RemoteMainController.m +++ b/apple_remote/RemoteMainController.m @@ -174,4 +174,4 @@ return remoteControlBehavior; } -@end
\ No newline at end of file +@end diff --git a/apple_remote/inc/AppleRemote.h b/apple_remote/inc/AppleRemote.h index aeb32f9f3892..509ddaa66c20 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 +@class CALayer; +@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 8e2aede3f34c..ad9c4f3f57a5 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 622441fce83c..44e4d17fc65d 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 a67ce4a96111..2469b5839904 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 +@class CALayer; +@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 9cffa35fae2f..a704febaa4fb 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 cbf8fd856235..a39f53ba65a2 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 +@class CALayer; +@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 f6cd40ba1178..e82fa6b88deb 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 7143f1f1eda9..167454071caf 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 +@class CALayer; +@class NSViewController; +typedef int NSColorRenderingIntent; +#define DID_DEFINE_SOME_FUTURE_TYPES +#endif +#endif + #import <Cocoa/Cocoa.h> #define AppleRemoteControlEvent 15 |