Merge branch 'master' of git@git.videolan.org:vlc

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

diff --git a/modules/gui/macosx/update.m b/modules/gui/macosx/update.m
index 920a991d6a1bd1c9c20465f4d086ae12a5160656..134b36789780357add76734b6b4c099aad5ce079 100644 (file)
--- a/modules/gui/macosx/update.m
+++ b/modules/gui/macosx/update.m
@@ -22,12 +22,13 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
+#import "update.h"
+
 #ifdef UPDATE_CHECK
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#import "update.h"
 
 static NSString * kPrefUpdateOnStartup = @"UpdateOnStartup";
 static NSString * kPrefUpdateLastTimeChecked = @"UpdateLastTimeChecked";
@@ -51,7 +52,7 @@ static VLCUpdate *_o_sharedInstance = nil;
         [self dealloc];
     } else {
         _o_sharedInstance = [super init];
-        b_checked = VLC_FALSE;
+        b_checked = false;
 
         /* clean the interface */
         [o_fld_releaseNote setString: @""];
@@ -117,7 +118,7 @@ static VLCUpdate *_o_sharedInstance = nil;
     {
         [o_bar_checking startAnimation: self];
         [self checkForUpdate];
-        b_checked = VLC_TRUE;
+        b_checked = true;
         [o_bar_checking stopAnimation: self];
     }
 }
@@ -190,7 +191,7 @@ static VLCUpdate *_o_sharedInstance = nil;
     [pool release];
 }
 
-static void updateCallback( void * p_data, vlc_bool_t b_success )
+static void updateCallback( void * p_data, bool b_success )
 {
     [(id)p_data setUpToDate: !b_success || update_CompareReleaseToCurrent( ((VLCUpdate*)p_data)->p_u ) == UpdateReleaseStatusNewer ];
 }