* ./src/stream_output/stream_output.c: Win32 compilation fix.

  * ./src/misc/modules.c: fixed a pointer indirection bug.

diff --git a/src/input/input_programs.c b/src/input/input_programs.c
index 0ce41505fac6efbcf38966339da83077b6e9d321..838e236b0173b36fc5728ccd337147409cb9cd48 100644 (file)
--- a/src/input/input_programs.c
+++ b/src/input/input_programs.c
@@ -2,7 +2,7 @@
  * input_programs.c: es_descriptor_t, pgrm_descriptor_t management
  *****************************************************************************
  * Copyright (C) 1999-2002 VideoLAN
- * $Id: input_programs.c,v 1.102 2003/03/11 23:56:54 gbazin Exp $
+ * $Id: input_programs.c,v 1.103 2003/03/12 05:26:46 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -753,7 +753,7 @@ static int ProgramCallback( vlc_object_t *p_this, char const *psz_cmd,
     if( ( newval.i_int > 0 ) )
     {
         vlc_mutex_unlock( &p_input->stream.stream_lock );
-        input_ChangeProgram( p_input, newval.i_int );
+        input_ChangeProgram( p_input, (uint16_t)newval.i_int );
         input_SetStatus( p_input, INPUT_STATUS_PLAY );
         vlc_mutex_lock( &p_input->stream.stream_lock );
     }

diff --git a/src/misc/modules.c b/src/misc/modules.c
index 5ee42cf75a52aa4f60963b750c36024d65d329c0..d5e1c070b5e9191eeee2c34ff97d8a44cf7ef354 100644 (file)
--- a/src/misc/modules.c
+++ b/src/misc/modules.c
@@ -2,7 +2,7 @@
  * modules.c : Builtin and plugin modules management functions
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: modules.c,v 1.115 2003/03/03 16:49:14 gbazin Exp $
+ * $Id: modules.c,v 1.116 2003/03/12 05:26:46 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Ethan C. Baldridge <BaldridgeE@cadmus.com>
@@ -586,9 +586,9 @@ static void AllocateAllPlugins( vlc_object_t *p_this )
         /* Under BeOS, we need to add beos_GetProgramPath() to access
          * files under the current directory */
 #ifdef WIN32
-        if( i_dirlen < 3 || ppsz_path[3] != '\\' )
+        if( i_dirlen < 3 || (*ppsz_path)[3] != '\\' )
 #else
-        if( ppsz_path[0] != '/' )
+        if( (*ppsz_path)[0] != '/' )
 #endif
         {
             i_dirlen += i_vlclen + 2;

diff --git a/src/misc/netutils.c b/src/misc/netutils.c
index 1719a8ac1003fd4801fdfae7427d39b5d1866baa..9554a10e0daad5f211c74679b5c3ebde3543a2ce 100644 (file)
--- a/src/misc/netutils.c
+++ b/src/misc/netutils.c
@@ -2,7 +2,7 @@
  * netutils.c: various network functions
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: netutils.c,v 1.80 2003/03/03 14:21:08 gbazin Exp $
+ * $Id: netutils.c,v 1.81 2003/03/12 05:26:46 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Benoit Steiner <benny@via.ecp.fr>
@@ -243,7 +243,7 @@ int __network_ChannelJoin( vlc_object_t *p_this, int i_channel )
 
     /* Build the message */
     sprintf( psz_mess, "%d %u %lu %s \n", i_channel, VLCS_VERSION,
-                       (unsigned long)(mdate() / (u64)1000000),
+                       (unsigned long)(mdate() / (uint64_t)1000000),
                        psz_mac );
 
     /* Send the message */

diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c
index 2c1e4c89a6c000ed054d9106c6b130e6a77c4d9d..07513db39a70dde48f21be54b069e34666f710e2 100644 (file)
--- a/src/stream_output/stream_output.c
+++ b/src/stream_output/stream_output.c
@@ -2,7 +2,7 @@
  * stream_output.c : stream output module
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: stream_output.c,v 1.19 2003/03/11 21:52:05 fenrir Exp $
+ * $Id: stream_output.c,v 1.20 2003/03/12 05:26:46 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Laurent Aimar <fenrir@via.ecp.fr>
@@ -1183,8 +1183,8 @@ static int  mrl_Parse( mrl_t *p_mrl, char *psz_mrl )
 #if defined( WIN32 ) || defined( UNDER_CE )
     if( psz_parser - psz_dup == 1 )
     {
-        msg_Warn( p_sout, "drive letter %c: found in source string",
-                          *psz_dup ) ;
+        /* msg_Warn( p_sout, "drive letter %c: found in source string",
+                          *psz_dup ) ; */
         psz_parser = "";
     }
 #endif