macosx: rename macro for mavericks detection since its out now

diff --git a/modules/gui/macosx/CompatibilityFixes.h b/modules/gui/macosx/CompatibilityFixes.h
index eae593be5fe1e851f7c31f2562ccd1e85bd48114..651a4b9a0a0bede1114970c796b54da7a0857d9a 100644 (file)
--- a/modules/gui/macosx/CompatibilityFixes.h
+++ b/modules/gui/macosx/CompatibilityFixes.h
@@ -28,7 +28,7 @@
 #define OSX_SNOW_LEOPARD (NSAppKitVersionNumber < 1115 && NSAppKitVersionNumber >= 1038)
 #define OSX_LION (NSAppKitVersionNumber < 1162 && NSAppKitVersionNumber >= 1115.2)
 #define OSX_MOUNTAIN_LION (NSAppKitVersionNumber < 1244 && NSAppKitVersionNumber >= 1162)
-#define OSX_REDACTED NSAppKitVersionNumber >= 1244
+#define OSX_MAVERICKS NSAppKitVersionNumber >= 1244
 
 #pragma mark -
 #pragma Fixes for OS X Snow Leopard (10.6)

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index aa777ce88c0c41cf1545bfa12aa84aeca35fa163..0fe54cf2b086cc2762b86284aebe71c81ff86c2a 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -1511,7 +1511,7 @@ static VLCMain *_o_sharedMainInstance = nil;
 
         IOReturn success;
         /* work-around a bug in 10.7.4 and 10.7.5, so check for 10.7.x < 10.7.4, 10.8 and 10.6 */
-        if ((NSAppKitVersionNumber >= 1115.2 && NSAppKitVersionNumber < 1138.45) || OSX_MOUNTAIN_LION || OSX_REDACTED || OSX_SNOW_LEOPARD) {
+        if ((NSAppKitVersionNumber >= 1115.2 && NSAppKitVersionNumber < 1138.45) || OSX_MOUNTAIN_LION || OSX_MAVERICKS || OSX_SNOW_LEOPARD) {
             CFStringRef reasonForActivity = CFStringCreateWithCString(kCFAllocatorDefault, _("VLC media playback"), kCFStringEncodingUTF8);
             if ([self activeVideoPlayback])
                 success = IOPMAssertionCreateWithName(kIOPMAssertionTypeNoDisplaySleep, kIOPMAssertionLevelOn, reasonForActivity, &systemSleepAssertionID);
@@ -1778,7 +1778,7 @@ static VLCMain *_o_sharedMainInstance = nil;
 - (NSString *)latestCrashLogPathPreviouslySeen:(BOOL)previouslySeen
 {
     NSString * crashReporter;
-    if (OSX_MOUNTAIN_LION || OSX_REDACTED)
+    if (OSX_MOUNTAIN_LION || OSX_MAVERICKS)
         crashReporter = [@"~/Library/Logs/DiagnosticReports" stringByExpandingTildeInPath];
     else
         crashReporter = [@"~/Library/Logs/CrashReporter" stringByExpandingTildeInPath];

diff --git a/modules/gui/macosx/macosx.m b/modules/gui/macosx/macosx.m
index 0e3efd68cb90cfddc6a3cce4456e94fed98f07b7..5b9047c0a9baef89c18513663fd9c0a7bd485f8d 100644 (file)
--- a/modules/gui/macosx/macosx.m
+++ b/modules/gui/macosx/macosx.m
@@ -141,7 +141,7 @@ vlc_module_begin()
     set_subcategory(SUBCAT_INTERFACE_MAIN)
     cannot_unload_broken_library()
 
-    BOOL b_have_mavericks = OSX_REDACTED;
+    BOOL b_have_mavericks = OSX_MAVERICKS;
 
     set_section(N_("Appearance"), 0)
         add_bool("macosx-interfacestyle", false, INTERFACE_STYLE_TEXT, INTERFACE_STYLE_LONGTEXT, false)

diff --git a/modules/gui/macosx/misc.m b/modules/gui/macosx/misc.m
index b3689faeb614a26192a0f558dbf535d23bb0c5c6..e02d2a9134935ffe94f4662c152429c2ab716e3e 100644 (file)
--- a/modules/gui/macosx/misc.m
+++ b/modules/gui/macosx/misc.m
@@ -172,7 +172,7 @@ static bool b_old_spaces_style = YES;
     /* init our fake object attribute */
     blackoutWindows = [[NSMutableArray alloc] initWithCapacity:1];
 
-    if (OSX_REDACTED) {
+    if (OSX_MAVERICKS) {
         NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
         [userDefaults addSuiteNamed:@"com.apple.spaces"];
         /* this is system settings -> mission control -> monitors using different spaces */