[vlc-commits] commit: Fix compiler warnings. ( Rémi Duraffort )

[git at videolan.org]

vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Wed Aug  4 00:14:00 2010 +0200| [f93eb575366f57526e7e010b99b3d23ab7262708] | committer: Rémi Duraffort 

Fix compiler warnings.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f93eb575366f57526e7e010b99b3d23ab7262708
---

 modules/access/dc1394.c   |    2 +-
 modules/demux/live555.cpp |    2 +-
 modules/gui/qt4/menus.cpp |    7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/modules/access/dc1394.c b/modules/access/dc1394.c
index 8531353..8ab82de 100644
--- a/modules/access/dc1394.c
+++ b/modules/access/dc1394.c
@@ -156,7 +156,7 @@ static int FindCamera( demux_sys_t *sys, demux_t *p_demux )
         }
         if( !found )
         {
-            msg_Err( p_demux, "Can't find camera with uid : 0x%llx.",
+            msg_Err( p_demux, "Can't find camera with uid : 0x%"PRIx64".",
                      sys->selected_uid );
             goto end;
         }
diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index c4973dc..18ff67c 100644
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -1626,7 +1626,7 @@ static block_t *StreamParseAsf( demux_t *p_demux, live_track_t *tk,
         else
         {
             /* Reset on broken stream */
-            msg_Err( p_demux, "Broken packet detected (%d vs %d or %d + %d vs %d)",
+            msg_Err( p_demux, "Broken packet detected (%d vs %zu or %d + %d vs %d)",
                      i_offset, tk->p_asf_block->i_buffer, i_offset, i_payload, i_packet_size);
             tk->p_asf_block->i_buffer = 0;
         }
diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index ad40922..3e682e0 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -27,6 +27,9 @@
  * - Remove static currentGroup
  */
 
+#define __STDC_FORMAT_MACROS 1
+#define __STDC_CONSTANT_MACROS 1
+
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
@@ -122,7 +125,7 @@ QAction* addMIMStaticEntry( intf_thread_t *p_intf,
                             bool bStatic = false )
 {
     QAction *action;
-    if( strlen( icon ) > 0 )
+    if( !EMPTY_STR( icon ) )
     {
         action = menu->addAction( text, THEMIM,  member );
         action->setIcon( QIcon( icon ) );
@@ -1390,7 +1393,7 @@ int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var,
             case VLC_VAR_INTEGER:
                 var_Get( p_object, psz_var, &val );
                 if( CURTEXT ) menutext = qfu( CURTEXT );
-                else menutext.sprintf( "%d", CURVAL.i_int );
+                else menutext.sprintf( "%"PRId64, CURVAL.i_int );
                 CreateAndConnect( submenu, psz_var, menutext, "", ITEM_RADIO,
                         p_object, CURVAL, i_type,
                         ( CURVAL.i_int == val.i_int )