* modules/misc/dummy/input.c, modules/access/file.c, include/vlc_common.h:

   msvc compilation fixes.

diff --git a/include/vlc_common.h b/include/vlc_common.h
index b3047466576aa7dfa9b02aae1a7b5084d0bc84b1..17319f0292e3d0cfeea7d4dac076f0fceb650039 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -3,7 +3,7 @@
  * Collection of useful common types and macros definitions
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: vlc_common.h,v 1.61 2003/04/14 22:22:32 massiot Exp $
+ * $Id: vlc_common.h,v 1.62 2003/04/16 11:47:08 gbazin Exp $
  *
  * Authors: Samuel Hocevar <sam@via.ecp.fr>
  *          Vincent Seguin <seguin@via.ecp.fr>
@@ -531,7 +531,9 @@ static inline uint64_t U64_AT( void * _p )
 #ifndef HAVE_STRCASECMP
 #   ifdef HAVE_STRICMP
 #       define strcasecmp stricmp
-#       define vlc_strcasecmp NULL
+#       if !defined(__PLUGIN__)
+#           define vlc_strcasecmp NULL
+#       endif
 #   elif !defined(__PLUGIN__)
 #       define strcasecmp vlc_strcasecmp
         VLC_EXPORT( int, vlc_strcasecmp, ( const char *s1, const char *s2 ) );
@@ -543,7 +545,9 @@ static inline uint64_t U64_AT( void * _p )
 #ifndef HAVE_STRNCASECMP
 #   ifdef HAVE_STRNICMP
 #       define strncasecmp strnicmp
-#       define vlc_strncasecmp NULL
+#       if !defined(__PLUGIN__)
+#           define vlc_strncasecmp NULL
+#       endif
 #   elif !defined(__PLUGIN__)
 #       define strncasecmp vlc_strncasecmp
         VLC_EXPORT( int, vlc_strncasecmp, ( const char *s1, const char *s2, size_t n ) );

diff --git a/modules/access/file.c b/modules/access/file.c
index f84f914017ed0103cd9936b3ff4886cde64c5ef1..4d961509a38677910becb54bb2ac99ee579386d4 100644 (file)
--- a/modules/access/file.c
+++ b/modules/access/file.c
@@ -2,7 +2,7 @@
  * file.c: file input (file: access plug-in)
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: file.c,v 1.17 2003/04/02 23:16:30 massiot Exp $
+ * $Id: file.c,v 1.18 2003/04/16 11:47:08 gbazin Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -48,12 +48,6 @@
 #   include <io.h>
 #endif
 
-#if defined( WIN32 ) && !defined( UNDER_CE )
-#   ifdef lseek
-#       undef lseek
-#   endif
-#   define lseek _lseeki64
-#endif
 /*****************************************************************************
  * Exported prototypes
  *****************************************************************************/
@@ -400,7 +394,11 @@ static void Seek( input_thread_t * p_input, off_t i_pos )
 #define S p_input->stream
     input_socket_t * p_access_data = (input_socket_t *)p_input->p_access_data;
 
+#if defined( WIN32 ) && !defined( UNDER_CE )
+    _lseeki64( p_access_data->i_handle, i_pos, SEEK_SET );
+#else
     lseek( p_access_data->i_handle, i_pos, SEEK_SET );
+#endif
 
     vlc_mutex_lock( &S.stream_lock );
     S.p_selected_area->i_tell = i_pos;

diff --git a/modules/misc/dummy/input.c b/modules/misc/dummy/input.c
index 83776e174448be1192f25f9fcff459b878db7f61..de4aa613594e5a8b3bfc6aa82aa9291ea065fee1 100644 (file)
--- a/modules/misc/dummy/input.c
+++ b/modules/misc/dummy/input.c
@@ -2,7 +2,7 @@
  * input_dummy.c: dummy input plugin, to manage "vlc:***" special options
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: input.c,v 1.2 2002/11/18 18:05:13 sam Exp $
+ * $Id: input.c,v 1.3 2003/04/16 11:47:08 gbazin Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -31,10 +31,6 @@
 #include <vlc/intf.h>
 #include <vlc/input.h>
 
-#ifndef HAVE_STRNCASECMP
-#   define strncasecmp(a,b,c) strcmp(a,b)
-#endif
-
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/