Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/macx
diff options
context:
space:
mode:
authorMikkel Krautz <mikkel@krautz.dk>2016-11-26 01:17:33 +0300
committerMikkel Krautz <mikkel@krautz.dk>2016-11-26 01:17:33 +0300
commitf01f6e552857938a00dae111a8cb932262e1b871 (patch)
treec6e2546bcd84b3dc5853d70424f2ac75a1e19a99 /macx
parent64d730a2a127fa520a5064c0f79616b37aad0c8a (diff)
macx/compat: fix build of compat.m shim with Sierra SDK.
The Sierra SDK seems to require an id<NSApplicationDelegate> for its setDelegate: call. To accomplish this, split off the existing adoption of NSFileManagerDelegate into a seperate class extension. Then, add another class extension for conforming to the NSApplicationDelegate protocol. Both of them are gated with MAC_OS_X_VERSION_MAX_ALLOWED to allow building with older SDKs.
Diffstat (limited to 'macx')
-rw-r--r--macx/compat/compat.m11
1 files changed, 9 insertions, 2 deletions
diff --git a/macx/compat/compat.m b/macx/compat/compat.m
index 46a83291e..cad4c11ec 100644
--- a/macx/compat/compat.m
+++ b/macx/compat/compat.m
@@ -6,10 +6,17 @@
#import <AppKit/AppKit.h>
@interface CompatApp : NSObject
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
-<NSFileManagerDelegate>
+@end
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
+@interface CompatApp (NSApplicationDelegateExtension) <NSApplicationDelegate>
+@end
#endif
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
+@interface CompatApp (NSFileManagerDelegateExtension) <NSFileManagerDelegate>
@end
+#endif
@implementation CompatApp