[vlc-commits] macosx: Some type-annotated array fixes for Xcode 7

[Marvin Scholz]

vlc | branch: master | Marvin Scholz <epirat07 at gmail.com> | Tue Nov 15 00:15:42 2016 +0100| [dcee486154ec8bdad0f68a4d023dfa2a3b17981d] | committer: Marvin Scholz

macosx: Some type-annotated array fixes for Xcode 7

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dcee486154ec8bdad0f68a4d023dfa2a3b17981d
---

 modules/gui/macosx/VLCRendererDialog.h    | 4 ++++
 modules/gui/macosx/VLCRendererDialog.m    | 4 ++++
 modules/gui/macosx/VLCRendererDiscovery.h | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/modules/gui/macosx/VLCRendererDialog.h b/modules/gui/macosx/VLCRendererDialog.h
index 4999294..1203610 100644
--- a/modules/gui/macosx/VLCRendererDialog.h
+++ b/modules/gui/macosx/VLCRendererDialog.h
@@ -28,7 +28,11 @@
 
 @interface VLCRendererDialog : NSWindowController <VLCRendererDiscoveryDelegate, NSWindowDelegate>
 
+#ifdef MAC_OS_X_VERSION_10_11
 @property NSMutableArray<VLCRendererItem*> *rendererItems;
+#else
+ at property NSMutableArray *rendererItems;
+#endif
 
 - (IBAction)selectRenderer:(id)sender;
 
diff --git a/modules/gui/macosx/VLCRendererDialog.m b/modules/gui/macosx/VLCRendererDialog.m
index 2be0fe3..fdff9c7 100644
--- a/modules/gui/macosx/VLCRendererDialog.m
+++ b/modules/gui/macosx/VLCRendererDialog.m
@@ -34,7 +34,11 @@
     IBOutlet NSTableView *tableView;
     IBOutlet NSArrayController *arrayController;
 
+#ifdef MAC_OS_X_VERSION_10_11
     NSMutableArray<VLCRendererDiscovery*> *renderer_discoveries;
+#else
+    NSMutableArray *renderer_discoveries;
+#endif
 
     intf_thread_t          *p_intf;
     vlc_renderer_discovery_t *p_rd;
diff --git a/modules/gui/macosx/VLCRendererDiscovery.h b/modules/gui/macosx/VLCRendererDiscovery.h
index 2406689..57d7fed 100644
--- a/modules/gui/macosx/VLCRendererDiscovery.h
+++ b/modules/gui/macosx/VLCRendererDiscovery.h
@@ -52,7 +52,11 @@
 /**
  Array of \c VLCRendererItems that the module discovered
  */
+#ifdef MAC_OS_X_VERSION_10_11
 @property (readonly) NSMutableArray<VLCRendererItem*> *rendererItems;
+#else
+ at property (readonly) NSMutableArray *rendererItems;
+#endif
 
 /**
  Indicates if the discovery has been started