macosx: Some type-annotated array fixes for Xcode 7
authorMarvin Scholz <epirat07@gmail.com>
Mon, 14 Nov 2016 23:15:42 +0000 (00:15 +0100)
committerMarvin Scholz <epirat07@gmail.com>
Mon, 14 Nov 2016 23:15:54 +0000 (00:15 +0100)
modules/gui/macosx/VLCRendererDialog.h
modules/gui/macosx/VLCRendererDialog.m
modules/gui/macosx/VLCRendererDiscovery.h

index 4999294..1203610 100644 (file)
 
 @interface VLCRendererDialog : NSWindowController <VLCRendererDiscoveryDelegate, NSWindowDelegate>
 
+#ifdef MAC_OS_X_VERSION_10_11
 @property NSMutableArray<VLCRendererItem*> *rendererItems;
+#else
+@property NSMutableArray *rendererItems;
+#endif
 
 - (IBAction)selectRenderer:(id)sender;
 
index 2be0fe3..fdff9c7 100644 (file)
     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;
index 2406689..57d7fed 100644 (file)
 /**
  Array of \c VLCRendererItems that the module discovered
  */
+#ifdef MAC_OS_X_VERSION_10_11
 @property (readonly) NSMutableArray<VLCRendererItem*> *rendererItems;
+#else
+@property (readonly) NSMutableArray *rendererItems;
+#endif
 
 /**
  Indicates if the discovery has been started