vlc | branch: master | David Fuhrmann <dfuhrm...@videolan.org> | Sun Aug 30 20:44:17 2015 +0200| [6f3da59e056dfdb5278132ceb427c0822ec50de3] | committer: David Fuhrmann
macosx: remove stray variables, fix include > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6f3da59e056dfdb5278132ceb427c0822ec50de3 --- modules/gui/macosx/MainMenu.m | 2 -- modules/gui/macosx/intf-prefs.m | 2 ++ modules/gui/macosx/intf.m | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/modules/gui/macosx/MainMenu.m b/modules/gui/macosx/MainMenu.m index 77e656b..83ae929 100644 --- a/modules/gui/macosx/MainMenu.m +++ b/modules/gui/macosx/MainMenu.m @@ -54,8 +54,6 @@ @interface VLCMainMenu() { - BOOL b_nib_bookmarks_loaded; - AboutWindowController *_aboutWindowController; HelpWindowController *_helpWindowController; AddonsWindowController *_addonsController; diff --git a/modules/gui/macosx/intf-prefs.m b/modules/gui/macosx/intf-prefs.m index f4b2d0e..89c7c3f 100644 --- a/modules/gui/macosx/intf-prefs.m +++ b/modules/gui/macosx/intf-prefs.m @@ -26,6 +26,8 @@ #import "intf-prefs.h" #import "CoreInteraction.h" +#include <unistd.h> /* execl() */ + @implementation VLCMain(OldPrefs) static NSString * kVLCPreferencesVersion = @"VLCPreferencesVersion"; diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index 252883f..dd9bc66 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -42,8 +42,6 @@ #include <vlc_url.h> #include <vlc_variables.h> -#include <unistd.h> /* execl() */ - #import "CompatibilityFixes.h" #import "InputManager.h" #import "MainMenu.h" @@ -153,11 +151,9 @@ static int ShowController(vlc_object_t *p_this, const char *psz_variable, BOOL launched; int items_at_launch; - BOOL nib_about_loaded; /* about nibfile */ BOOL b_active_videoplayback; NSWindowController *_mainWindowController; - VLCMainMenu *_mainmenu; VLCPrefs *_prefs; VLCSimplePrefs *_sprefs; _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits