* modules/control/hotkeys.c, rc, modules/demux/mp4, modules/access/mms: portability...

diff --git a/modules/access/mms/mmstu.c b/modules/access/mms/mmstu.c
index 941ed52686adfd498f0b0b8bbe3e80627679fed4..6717b6c07fe4c30b8d562bbfe4528ee14df737e3 100644 (file)
--- a/modules/access/mms/mmstu.c
+++ b/modules/access/mms/mmstu.c
@@ -26,14 +26,17 @@
  * Preamble
  *****************************************************************************/
 #include <stdlib.h>
-#include <sys/time.h>
+#include <vlc/vlc.h>
+
+#ifdef HAVE_SYS_TIME_H
+#   include <sys/time.h>
+#endif
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <string.h>
 #include <errno.h>
 #include <fcntl.h>
 
-#include <vlc/vlc.h>
 #include <vlc/input.h>
 
 #ifdef HAVE_UNISTD_H

diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c
index 6145792352dd142cb61ee823f08125f50b649a99..36c3836bc24b7ca14f942204ed1532fd8b388707 100755 (executable)
--- a/modules/control/hotkeys.c
+++ b/modules/control/hotkeys.c
@@ -313,8 +313,8 @@ static void Run( intf_thread_t *p_intf )
         }
         else if( i_action == ACTIONID_FULLSCREEN && p_vout )
         {
-            var_Get( p_vout, "fullscreen", &val );
-            var_Set( p_vout, "fullscreen", (vlc_value_t)!val.b_bool );
+            var_Get( p_vout, "fullscreen", &val ); val.b_bool = !val.b_bool;
+            var_Set( p_vout, "fullscreen", val );
         }
         else if( i_action == ACTIONID_PLAY )
         {

diff --git a/modules/control/rc.c b/modules/control/rc.c
index 057cf2a758d25c15f12b3e54e9525f3dd3f87f74..c0b56331777dab36b04af1ad5ce5b567beec48d9 100644 (file)
--- a/modules/control/rc.c
+++ b/modules/control/rc.c
@@ -1158,7 +1158,7 @@ vlc_bool_t ReadCommand( intf_thread_t *p_intf, char *p_buffer, int *pi_size )
 
     while( !p_intf->b_die && *pi_size < MAX_LINE_LENGTH &&
            (i_read = net_ReadNonBlock( p_intf, p_intf->p_sys->i_socket == -1 ?
-                       STDIN_FILENO : p_intf->p_sys->i_socket,
+                       0 /*STDIN_FILENO*/ : p_intf->p_sys->i_socket,
                        p_buffer + *pi_size, 1, INTF_IDLE_SLEEP ) ) > 0 )
     {
         if( p_buffer[ *pi_size ] == '\r' || p_buffer[ *pi_size ] == '\n' )

diff --git a/modules/demux/mp4/drms.c b/modules/demux/mp4/drms.c
index ae344e2d678db6c9d2575be3320f587969ef3a56..784c633d18991989b9f1a9cf0257d2b019f13753 100644 (file)
--- a/modules/demux/mp4/drms.c
+++ b/modules/demux/mp4/drms.c
@@ -42,6 +42,9 @@
 #endif
 
 #ifdef WIN32
+#   if !defined( UNDER_CE )
+#       include <direct.h>
+#   endif
 #   include <tchar.h>
 #   include <shlobj.h>
 #   include <windows.h>

diff --git a/modules/demux/mp4/drms.h b/modules/demux/mp4/drms.h
index 5b79cd91b3db136ed583456813c5ca9a62cd6e3e..0993e76815af09c889d73c89b6e8b55f10e919bb 100644 (file)
--- a/modules/demux/mp4/drms.h
+++ b/modules/demux/mp4/drms.h
@@ -2,7 +2,7 @@
  * drms.h : DRMS
  *****************************************************************************
  * Copyright (C) 2004 VideoLAN
- * $Id: drms.h,v 1.2 2004/01/09 04:37:43 jlj Exp $
+ * $Id$
  *
  * Author: Jon Lech Johansen <jon-vl@nanocrew.net>
  *

diff --git a/modules/demux/mp4/drmstables.h b/modules/demux/mp4/drmstables.h
index cff5bce5ba0835dd7d538f9cf8a1aecb7acbfe1c..9216d85a3c6a8937035df5182b0c0562b9927299 100644 (file)
--- a/modules/demux/mp4/drmstables.h
+++ b/modules/demux/mp4/drmstables.h
@@ -2,7 +2,7 @@
  * drmstables.h : AES/Rijndael block cipher and miscellaneous tables
  *****************************************************************************
  * Copyright (C) 2004 VideoLAN
- * $Id: drmstables.h,v 1.3 2004/01/18 01:21:33 sam Exp $
+ * $Id$
  *
  * Author: Jon Lech Johansen <jon-vl@nanocrew.net>
  *

diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index 4f5924fc5a54a04a43aadcedb1586ea994bfb0ba..07d46b5b25ae6f7a669b0f68076497d442cda9e6 100644 (file)
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -145,7 +145,7 @@ static void MP4_ConvertDate2Str( char *psz, uint64_t i_date )
     int i_sec;
 
     /* date begin at 1 jan 1904 */
-    i_date += ((1904U * 365) + 17) * 24 * 60 * 60;
+    i_date += ((I64C(1904) * 365) + 17) * 24 * 60 * 60;
 
     i_day = i_date / ( 60*60*24);
     i_hour = ( i_date /( 60*60 ) ) % 60;
@@ -1891,14 +1891,13 @@ static void MP4_FreeBox_cmvd( MP4_Box_t *p_box )
 
 static int MP4_ReadBox_cmov( MP4_Stream_t *p_stream, MP4_Box_t *p_box )
 {
-    MP4_Stream_t *p_stream_memory;
-
     MP4_Box_t *p_dcom;
     MP4_Box_t *p_cmvd;
 #ifdef HAVE_ZLIB_H
+    MP4_Stream_t *p_stream_memory;
     z_stream  z_data;
-#endif
     uint8_t *p_data;
+#endif
 
     int i_result;