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

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

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 )
         {

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' )

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>

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>
  *

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>
  *

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;