Clean up (with a little help from clang)

diff --git a/modules/control/unimotion.c b/modules/control/unimotion.c
index 6e60c1a4fb5a0aa705676edc5750a89e0a6a79c7..39b6c1b9704b5a61f4da56971d0cf5afe7682b7b 100644 (file)
--- a/modules/control/unimotion.c
+++ b/modules/control/unimotion.c
@@ -189,13 +189,8 @@ static int probe_sms(int kernFunc, char *servMatch, int dataType, void *data)
     memset(&inputStructure, 0, sizeof(union motion_data));
     memset(outputStructure, 0, sizeof(union motion_data));
 
-#ifdef __LP64__
     result = IOConnectCallStructMethod(dataPort, kernFunc, &inputStructure, 
                 structureInputSize, outputStructure, &structureOutputSize );
-#else
-    result = IOConnectMethodStructureIStructureO(dataPort, kernFunc, structureInputSize,
-                &structureOutputSize, &inputStructure, outputStructure);
-#endif
 
     IOServiceClose(dataPort);
 

diff --git a/modules/gui/macosx/prefs_widgets.h b/modules/gui/macosx/prefs_widgets.h
index 79823495cb2d696996ec81d5037f58e0bc35cb47..077e5c241dc14987e2943825fe3752f42dce169a 100644 (file)
--- a/modules/gui/macosx/prefs_widgets.h
+++ b/modules/gui/macosx/prefs_widgets.h
@@ -27,6 +27,8 @@
 #define LEFTMARGIN  18
 #define RIGHTMARGIN 18
 
+static NSMenu   *o_keys_menu = nil;
+
 @interface VLCConfigControl : NSView
 {
     module_config_t *p_item;
@@ -51,7 +53,6 @@
 - (void)applyChanges;
 - (int)labelSize;
 - (void) alignWithXPosition:(int)i_xPos;
-static NSMenu   *o_keys_menu = nil;
 
 + (int)calcVerticalMargin: (int)i_curItem lastItem:(int)i_lastItem;
 

diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index fe0579404eafd0774a44472c7eaf8b397d1fd4e8..2e457c1680a116196d98b658b4bd65f3bdb2de5f 100644 (file)
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -315,7 +315,7 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des
         NSMenuItem *mi;
         if( p_item->ppsz_list_text != NULL )
             mi = [[NSMenuItem alloc] initWithTitle: _NS( p_item->ppsz_list_text[i] ) action:NULL keyEquivalent: @""];
-        else if( p_item->ppsz_list[i] && p_item->ppsz_list[i] == "" )
+        else if( p_item->ppsz_list[i] && strcmp(p_item->ppsz_list[i],"") == 0 )
         {
             [[object menu] addItem: [NSMenuItem separatorItem]];
             continue;