Fix conflicts.

[vlc] / modules / gui / macosx / misc.m

diff --git a/modules/gui/macosx/misc.m b/modules/gui/macosx/misc.m
index fe7b5077568c3e14fbabb8b369514997837e6291..4d77a3824b94d39f8b7cfdbd67d1507ee8fff918 100644 (file)
--- a/modules/gui/macosx/misc.m
+++ b/modules/gui/macosx/misc.m
@@ -91,7 +91,7 @@
 
 @implementation NSAnimation (VLCAdditions)
 /* fake class attributes  */
-static NSMapTable *VLCAdditions_userInfo = nil;
+static NSMapTable *VLCAdditions_userInfo = NULL;
 
 + (void)load
 {
@@ -124,7 +124,7 @@ static NSMapTable *VLCAdditions_userInfo = nil;
 
 @implementation NSScreen (VLCAdditions)
 
-static NSMutableArray *blackoutWindows = nil;
+static NSMutableArray *blackoutWindows = NULL;
 
 + (void)load
 {
@@ -132,12 +132,6 @@ static NSMutableArray *blackoutWindows = nil;
     blackoutWindows = [[NSMutableArray alloc] initWithCapacity:1];
 }
 
-- (void)dealloc
-{
-    [blackoutWindows release];
-    [super dealloc];
-}
-
 + (NSScreen *)screenWithDisplayID: (CGDirectDisplayID)displayID
 {
     int i;