* VC++/Intel compiler fixes by Jon Lech Johansen <jon-vl@nanocrew.net>.

20823a81 · Sam Hocevar · ed87d047 · 20823a81 · 20823a81 · 20823a81
Commit 20823a81 authored Jul 30, 2001 by Sam Hocevar
14 changed files
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
 #===================#

 HEAD
+  * VC++/Intel compiler fixes by Jon Lech Johansen <jon-vl@nanocrew.net>.
  * Better gtk-config detection.
  * Removed duplicate checks in configure.in.
  * Fixed a typo in vlc.spec.

--- a/configure
+++ b/configure
@@ -4038,11 +4038,12 @@ else
 fi

  SDL_HEADER="SDL/SDL.h"
-  if test x${SDL_CONFIG} = xno; then
+  if test x${SDL_CONFIG} = xno
+  then
    # Extract the first word of "sdl11-config", so it can be a program name with args.
 set dummy sdl11-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4046: checking for $ac_word" >&5
+echo "configure:4047: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_SDL11_CONFIG'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4078,11 +4079,12 @@ fi
    SDL_CONFIG=${SDL11_CONFIG}
    SDL_HEADER="SDL11/SDL.h"
  fi
-  if test x${SDL_CONFIG} = xno; then
+  if test x${SDL_CONFIG} = xno
+  then
    # Extract the first word of "sdl12-config", so it can be a program name with args.
 set dummy sdl12-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4086: checking for $ac_word" >&5
+echo "configure:4088: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_SDL12_CONFIG'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4118,22 +4120,23 @@ fi
    SDL_CONFIG=${SDL12_CONFIG}
    SDL_HEADER="SDL12/SDL.h"
  fi
-  if test x${SDL_CONFIG} != xno; then
+  if test x${SDL_CONFIG} != xno
+  then
    for ac_hdr in $SDL_HEADER
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4127: checking for $ac_hdr" >&5
+echo "configure:4130: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 4132 "configure"
+#line 4135 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4137: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4140: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -4162,7 +4165,7 @@ echo "The development package for SDL is not installed. Please install it"
 fi
 done

-    if expr 1.1.5 \> $($SDL_CONFIG --version) >/dev/null
+    if expr 1.1.5 \> `$SDL_CONFIG --version` >/dev/null
    then
      echo "You need SDL version 1.1.5 or later."
      exit
@@ -4193,17 +4196,17 @@ if test "${with_directx+set}" = set; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4197: checking for $ac_hdr" >&5
+echo "configure:4200: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 4202 "configure"
+#line 4205 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4207: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4210: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -4241,17 +4244,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4245: checking for $ac_hdr" >&5
+echo "configure:4248: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 4250 "configure"
+#line 4253 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4255: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4258: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -4357,7 +4360,7 @@ then
  # Extract the first word of "gtk-config", so it can be a program name with args.
 set dummy gtk-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4361: checking for $ac_word" >&5
+echo "configure:4364: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4402,17 +4405,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4406: checking for $ac_hdr" >&5
+echo "configure:4409: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 4411 "configure"
+#line 4414 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4419: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -4463,17 +4466,17 @@ if test x$enable_x11 != xno; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4467: checking for $ac_hdr" >&5
+echo "configure:4470: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 4472 "configure"
+#line 4475 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4477: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4480: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -4525,17 +4528,17 @@ if test x$enable_xvideo != xno; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4529: checking for $ac_hdr" >&5
+echo "configure:4532: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 4534 "configure"
+#line 4537 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4539: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4542: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -4575,17 +4578,17 @@ if test "${enable_alsa+set}" = set; then
   then
     ac_safe=`echo "sys/asoundlib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/asoundlib.h""... $ac_c" 1>&6
-echo "configure:4579: checking for sys/asoundlib.h" >&5
+echo "configure:4582: checking for sys/asoundlib.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 4584 "configure"
+#line 4587 "configure"
 #include "confdefs.h"
 #include <sys/asoundlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4589: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4592: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
  rm -rf conftest*
@@ -4602,7 +4605,7 @@ fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
  echo "$ac_t""yes" 1>&6
  echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6
-echo "configure:4606: checking for main in -lasound" >&5
+echo "configure:4609: checking for main in -lasound" >&5
 ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@@ -4610,14 +4613,14 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lasound  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4614 "configure"
+#line 4617 "configure"
 #include "confdefs.h"

 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:4621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
 else

--- a/configure.in
+++ b/configure.in
@@ -529,22 +529,25 @@ if test "x$withval" != "xno"
 then
  AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
  SDL_HEADER="SDL/SDL.h"
-  if test x${SDL_CONFIG} = xno; then
+  if test x${SDL_CONFIG} = xno
+  then
    AC_PATH_PROG(SDL11_CONFIG, sdl11-config, no)
    SDL_CONFIG=${SDL11_CONFIG}
    SDL_HEADER="SDL11/SDL.h"
  fi
-  if test x${SDL_CONFIG} = xno; then
+  if test x${SDL_CONFIG} = xno
+  then
    AC_PATH_PROG(SDL12_CONFIG, sdl12-config, no)
    SDL_CONFIG=${SDL12_CONFIG}
    SDL_HEADER="SDL12/SDL.h"
  fi
-  if test x${SDL_CONFIG} != xno; then
+  if test x${SDL_CONFIG} != xno
+  then
    AC_CHECK_HEADERS($SDL_HEADER, [],
 	[ echo "The development package for SDL is not installed. Please install it"
 	  echo "and try again."
 	  exit ])
-    if expr 1.1.5 \> $($SDL_CONFIG --version) >/dev/null
+    if expr 1.1.5 \> `$SDL_CONFIG --version` >/dev/null
    then
      echo "You need SDL version 1.1.5 or later."
      exit

--- a/extras/libdvdcss/libdvdcss.c
+++ b/extras/libdvdcss/libdvdcss.c
@@ -2,7 +2,7 @@
 * libdvdcss.c: DVD reading library.
 *****************************************************************************
 * Copyright (C) 1998-2001 VideoLAN
- * $Id: libdvdcss.c,v 1.11 2001/07/28 02:17:37 sam Exp $
+ * $Id: libdvdcss.c,v 1.12 2001/07/30 00:53:04 sam Exp $
 *
 * Authors: Stphane Borel <stef@via.ecp.fr>
 *          Samuel Hocevar <sam@zoy.org>
@@ -38,8 +38,7 @@
 #endif

 #if defined( WIN32 )
-#   include <io.h>
-#   include "input_iovec.h"
+#   include <io.h>                                                 /* read() */
 #else
 #   include <sys/uio.h>                                      /* struct iovec */
 #endif
@@ -47,6 +46,10 @@
 #include "config.h"
 #include "common.h"

+#if defined( WIN32 )
+#   include "input_iovec.h"
+#endif
+
 #include "videolan/dvdcss.h"
 #include "libdvdcss.h"
 #include "ioctl.h"
@@ -807,7 +810,7 @@ static int _win32_dvdcss_aread( int i_fd, void *p_data, int i_blocks )

        /* transfer the next 64kb (_win32_dvdcss_aread is called recursively)
         * We need to check the status of the read on return */
-        if( _win32_dvdcss_aread( i_fd, p_data + 32 * DVDCSS_BLOCK_SIZE,
+        if( _win32_dvdcss_aread( i_fd, (u8*) p_data + 32 * DVDCSS_BLOCK_SIZE,
                                 i_blocks - 32) < 0 )
        {
            return -1;

--- 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.36 2001/07/08 17:45:51 gbazin Exp $
+ * $Id: common.h,v 1.37 2001/07/30 00:53:04 sam Exp $
 *
 * Authors: Samuel Hocevar <sam@via.ecp.fr>
 *          Vincent Seguin <seguin@via.ecp.fr>
@@ -207,13 +207,11 @@ struct pgrm_descriptor_s;
 #endif

 #if defined( WIN32 )
+#   ifndef _OFF_T_DEFINED
 typedef __int64 off_t;
-#ifndef snprintf
-#define snprintf _snprintf         /* snprintf not defined in mingw32 (bug?) */
-#endif
+#       define _OFF_T_DEFINED
+#   endif
+#   ifndef snprintf
+#       define snprintf _snprintf  /* snprintf not defined in mingw32 (bug?) */
+#   endif
 #endif
-
-
-
-
-
--- a/plugins/directx/aout_directx.c
+++ b/plugins/directx/aout_directx.c
@@ -2,7 +2,7 @@
 * aout_directx.c: Windows DirectX audio output method
 *****************************************************************************
 * Copyright (C) 1999, 2000 VideoLAN
- * $Id: aout_directx.c,v 1.6 2001/07/25 08:41:21 gbazin Exp $
+ * $Id: aout_directx.c,v 1.7 2001/07/30 00:53:04 sam Exp $
 *
 * Authors: Gildas Bazin <gbazin@netcourrier.com>
 *
@@ -39,7 +39,11 @@
 #include <errno.h>                                                 /* ENOMEM */
 #include <fcntl.h>                                       /* open(), O_WRONLY */
 #include <string.h>                                            /* strerror() */
-#include <unistd.h>                                      /* write(), close() */
+
+#ifdef HAVE_UNISTD_H
+#   include <unistd.h>                                   /* write(), close() */
+#endif
+
 #include <stdio.h>                                           /* "intf_msg.h" */
 #include <stdlib.h>                            /* calloc(), malloc(), free() */

@@ -49,7 +53,11 @@
 #include "mtime.h"
 #include "tests.h"

-#include "directx.h"
+#if defined( _MSC_VER )
+#   include <dsound.h>
+#else
+#   include "directx.h"
+#endif

 #include "audio_output.h"                                   /* aout_thread_t */


--- a/plugins/directx/vout_directx.c
+++ b/plugins/directx/vout_directx.c
@@ -2,7 +2,7 @@
 * vout_directx.c: Windows DirectX video output display method
 *****************************************************************************
 * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: vout_directx.c,v 1.8 2001/07/12 23:06:54 gbazin Exp $
+ * $Id: vout_directx.c,v 1.9 2001/07/30 00:53:04 sam Exp $
 *
 * Authors: Gildas Bazin <gbazin@netcourrier.com>
 *
@@ -56,7 +56,12 @@

 #include <windows.h>
 #include <windowsx.h>
-#include <directx.h>
+
+#if defined( _MSC_VER )
+#   include <ddraw.h>
+#else
+#   include <directx.h>
+#endif

 #include "config.h"
 #include "common.h"
@@ -616,19 +621,19 @@ static void vout_Display( vout_thread_t *p_vout )
                   i_image_width/2);
 #else
            /* copy Y, we copy two lines at once */
-            memcpy(ddsd.lpSurface + i*2*ddsd.lPitch,
+            memcpy((u8*)ddsd.lpSurface + i*2*ddsd.lPitch,
                   p_vout->p_rendered_pic->p_y + i*2*i_image_width,
                   i_image_width);
-            memcpy(ddsd.lpSurface + (i*2+1)*ddsd.lPitch,
+            memcpy((u8*)ddsd.lpSurface + (i*2+1)*ddsd.lPitch,
                   p_vout->p_rendered_pic->p_y + (i*2+1)*i_image_width,
                   i_image_width);
            /* then V */
-            memcpy((ddsd.lpSurface + ddsd.dwHeight * ddsd.lPitch)
+            memcpy(((u8*)ddsd.lpSurface + ddsd.dwHeight * ddsd.lPitch)
                      + i * ddsd.lPitch/2,
                   p_vout->p_rendered_pic->p_v + i*i_image_width/2,
                   i_image_width/2);
            /* and U */
-            memcpy((ddsd.lpSurface + ddsd.dwHeight * ddsd.lPitch)
+            memcpy(((u8*)ddsd.lpSurface + ddsd.dwHeight * ddsd.lPitch)
                      + (ddsd.dwHeight * ddsd.lPitch/4)
                      + i * ddsd.lPitch/2,
                   p_vout->p_rendered_pic->p_u + i*i_image_width/2,

--- a/plugins/directx/vout_events.c
+++ b/plugins/directx/vout_events.c
@@ -2,7 +2,7 @@
 * vout_events.c: Windows DirectX video output events handler
 *****************************************************************************
 * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: vout_events.c,v 1.3 2001/07/25 08:41:21 gbazin Exp $
+ * $Id: vout_events.c,v 1.4 2001/07/30 00:53:04 sam Exp $
 *
 * Authors: Gildas Bazin <gbazin@netcourrier.com>
 *
@@ -44,7 +44,12 @@

 #include <windows.h>
 #include <windowsx.h>
-#include <directx.h>
+
+#if defined( _MSC_VER )
+#   include <ddraw.h>
+#else
+#   include <directx.h>
+#endif

 #include "intf_msg.h"
 #include "interface.h"

--- a/plugins/dvd/dvd_netlist.c
+++ b/plugins/dvd/dvd_netlist.c
@@ -7,7 +7,7 @@
 * will only be given back to netlist when refcount is zero.
 *****************************************************************************
 * Copyright (C) 1998, 1999, 2000, 2001 VideoLAN
- * $Id: dvd_netlist.c,v 1.12 2001/07/17 09:48:07 massiot Exp $
+ * $Id: dvd_netlist.c,v 1.13 2001/07/30 00:53:05 sam Exp $
 *
 * Authors: Henri Fallon <henri@videolan.org>
 *          Stphane Borel <stef@videolan.org>
@@ -41,8 +41,7 @@
 #endif

 #if defined( WIN32 )
-#   include <io.h>
-#   include "input_iovec.h"
+#   include <io.h>                                                 /* read() */
 #else
 #   include <sys/uio.h>                                      /* struct iovec */
 #endif
@@ -53,6 +52,10 @@
 #include "mtime.h"
 #include "intf_msg.h"                                           /* intf_*Msg */

+#if defined( WIN32 )
+#   include "input_iovec.h"
+#endif
+
 #include "stream_control.h"
 #include "input_ext-intf.h"
 #include "input_ext-dec.h"

--- a/plugins/dvd/input_dvd.c
+++ b/plugins/dvd/input_dvd.c
@@ -10,7 +10,7 @@
 *  -dvd_udf to find files
 *****************************************************************************
 * Copyright (C) 1998-2001 VideoLAN
- * $Id: input_dvd.c,v 1.81 2001/07/27 01:05:17 sam Exp $
+ * $Id: input_dvd.c,v 1.82 2001/07/30 00:53:05 sam Exp $
 *
 * Author: Stphane Borel <stef@via.ecp.fr>
 *
@@ -54,8 +54,7 @@
 #endif

 #if defined( WIN32 )
-#   include <io.h>
-#   include "input_iovec.h"
+#   include <io.h>                                                 /* read() */
 #else
 #   include <sys/uio.h>                                      /* struct iovec */
 #endif
@@ -68,6 +67,10 @@
 #include "mtime.h"
 #include "tests.h"

+#if defined( WIN32 )
+#   include "input_iovec.h"
+#endif
+
 #include "intf_msg.h"

 #include "main.h"

--- a/plugins/mpeg/input_es.c
+++ b/plugins/mpeg/input_es.c
@@ -2,7 +2,7 @@
 * input_es.c: Elementary Stream demux and packet management
 *****************************************************************************
 * Copyright (C) 2001 VideoLAN
- * $Id: input_es.c,v 1.8 2001/07/17 09:48:07 massiot Exp $
+ * $Id: input_es.c,v 1.9 2001/07/30 00:53:05 sam Exp $
 *
 * Author: Christophe Massiot <massiot@via.ecp.fr>
 *
@@ -38,15 +38,12 @@

 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
-#elif defined( _MSC_VER ) && defined( _WIN32 )
-#   include <io.h>
 #endif

 #include <fcntl.h>

 #if defined( WIN32 )
-#   include <io.h>
-#   include "input_iovec.h"
+#   include <io.h>                                                 /* read() */
 #else
 #   include <sys/uio.h>                                      /* struct iovec */
 #endif
@@ -57,6 +54,10 @@
 #include "mtime.h"
 #include "tests.h"

+#if defined( WIN32 )
+#   include "input_iovec.h"
+#endif
+
 #include "intf_msg.h"

 #include "main.h"

--- a/plugins/mpeg/input_ts.c
+++ b/plugins/mpeg/input_ts.c
@@ -2,7 +2,7 @@
 * input_ts.c: TS demux and netlist management
 *****************************************************************************
 * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: input_ts.c,v 1.30 2001/07/17 09:48:08 massiot Exp $
+ * $Id: input_ts.c,v 1.31 2001/07/30 00:53:05 sam Exp $
 *
 * Authors: Henri Fallon <henri@videolan.org>
 *
@@ -58,7 +58,6 @@
 #if defined( WIN32 )
 #   include <io.h>
 #   include <winsock2.h>
-#   include "input_iovec.h"
 #else
 #   include <sys/uio.h>                                      /* struct iovec */
 #endif
@@ -69,6 +68,10 @@
 #include "mtime.h"
 #include "tests.h"

+#if defined( WIN32 )
+#   include "input_iovec.h"
+#endif
+
 #include "intf_msg.h"

 #include "stream_control.h"

--- a/src/input/input_netlist.c
+++ b/src/input/input_netlist.c
@@ -2,7 +2,7 @@
 * input_netlist.c: netlist management
 *****************************************************************************
 * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: input_netlist.c,v 1.40 2001/07/17 09:48:08 massiot Exp $
+ * $Id: input_netlist.c,v 1.41 2001/07/30 00:53:05 sam Exp $
 *
 * Authors: Henri Fallon <henri@videolan.org>
 *
@@ -34,11 +34,10 @@
 #   include <unistd.h>
 #endif

-#if !defined( WIN32 )
-#   include <sys/uio.h>                                      /* struct iovec */
+#if defined( WIN32 )
+#   include <io.h>                                                 /* read() */
 #else
-#   include <io.h>
-#   include "input_iovec.h"
+#   include <sys/uio.h>                                      /* struct iovec */
 #endif

 #include "config.h"
@@ -47,6 +46,10 @@
 #include "mtime.h"
 #include "intf_msg.h"                                           /* intf_*Msg */

+#if defined( WIN32 )
+#   include "input_iovec.h"
+#endif
+
 #include "stream_control.h"
 #include "input_ext-intf.h"
 #include "input_ext-dec.h"

--- a/src/interface/main.c
+++ b/src/interface/main.c
@@ -4,7 +4,7 @@
 * and spawn threads.
 *****************************************************************************
 * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: main.c,v 1.108 2001/07/18 14:21:00 massiot Exp $
+ * $Id: main.c,v 1.109 2001/07/30 00:53:05 sam Exp $
 *
 * Authors: Vincent Seguin <seguin@via.ecp.fr>
 *          Samuel Hocevar <sam@zoy.org>
@@ -49,11 +49,13 @@
 #endif

 #ifndef WIN32
-#include <netinet/in.h>                               /* BSD: struct in_addr */
+#   include <netinet/in.h>                            /* BSD: struct in_addr */
 #endif

 #ifdef HAVE_UNISTD_H
-#include <unistd.h>
+#   include <unistd.h>
+#elif defined( _MSC_VER ) && defined( _WIN32 )
+#   include <io.h>
 #endif

 #include <errno.h>                                                 /* ENOMEM */