* Fixed some win32 compile issues.

  * Don't use long long, use u64/s64 (int_types.h).

diff --git a/include/common.h b/include/common.h
index ab36323d14f6fcbe7f6d15b2e0c7d481e22d642f..30e1ce30e83dd385a3b6fedef640495a67f2de3d 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -3,7 +3,7 @@
  * Collection of useful common types and macros definitions
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: common.h,v 1.44 2001/10/31 11:55:53 reno Exp $
+ * $Id: common.h,v 1.45 2001/11/07 22:58:13 jlj Exp $
  *
  * Authors: Samuel Hocevar <sam@via.ecp.fr>
  *          Vincent Seguin <seguin@via.ecp.fr>
@@ -232,10 +232,6 @@ struct pgrm_descriptor_s;
 #endif
 
 #if defined( WIN32 )
-#   ifndef _OFF_T_DEFINED
-typedef __int64 off_t;
-#       define _OFF_T_DEFINED
-#   endif
 #   ifndef snprintf
 #       define snprintf _snprintf  /* snprintf not defined in mingw32 (bug?) */
 #   endif

diff --git a/plugins/dummy/input_dummy.c b/plugins/dummy/input_dummy.c
index eeaa6dc3ff3034b49ba6e6b739a48d7579d260b1..01331468eb3bf8e2f6377c83b62326db018718c1 100644 (file)
--- a/plugins/dummy/input_dummy.c
+++ b/plugins/dummy/input_dummy.c
@@ -2,7 +2,7 @@
  * input_dummy.c: dummy input plugin, to manage "vlc:***" special options
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: input_dummy.c,v 1.5 2001/08/09 08:20:26 sam Exp $
+ * $Id: input_dummy.c,v 1.6 2001/11/07 22:58:13 jlj Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -30,6 +30,7 @@
 #include "defs.h"
 
 #include <stdlib.h>
+#include <sys/types.h>
 #include <string.h>
 #include <errno.h>
 

diff --git a/src/audio_output/aout_common.h b/src/audio_output/aout_common.h
index 1980ba8b61d5fcd268341edf659b2a7cae2f29d4..a701f28a67470f5f7d8bc282f900fb12c6ade164 100644 (file)
--- a/src/audio_output/aout_common.h
+++ b/src/audio_output/aout_common.h
@@ -2,7 +2,7 @@
  * aout_common.h: audio output inner functions
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: aout_common.h,v 1.5 2001/11/01 00:29:54 asmax Exp $
+ * $Id: aout_common.h,v 1.6 2001/11/07 22:58:13 jlj Exp $
  *
  * Authors: Michel Kaempf <maxx@via.ecp.fr>
  *
@@ -79,7 +79,7 @@ static __inline__ int NextFrame( aout_thread_t * p_aout, aout_fifo_t * p_fifo,
                                  mtime_t aout_date )
 {
     long l_units, l_rate;
-    long long l_delta;    
+    u64 l_delta;    
 
     /* We take the lock */
     vlc_mutex_lock( &p_fifo->data_lock );

diff --git a/src/input/input.c b/src/input/input.c
index 99e90df69ca940ca4a2b21a785002ffa7b1e08f8..9c1c4f183b493e4eaa94a04826ccd8b33764107f 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -4,7 +4,7 @@
  * decoders.
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: input.c,v 1.150 2001/11/06 17:12:02 massiot Exp $
+ * $Id: input.c,v 1.151 2001/11/07 22:58:13 jlj Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -47,15 +47,12 @@
 #endif
 
 #ifdef WIN32
-#   include <winsock.h>
 #   include <winsock2.h>
 #elif !defined( SYS_BEOS ) && !defined( SYS_NTO )
 #   include <netdb.h>                                         /* hostent ... */
 #   include <sys/socket.h>
 #   include <netinet/in.h>
 #   include <arpa/inet.h>
-#   include <sys/types.h>
-#   include <sys/socket.h>
 #endif
 
 #ifdef HAVE_SYS_TIMES_H