3 files changed, 16 insertions, 12 deletions
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index e848710ef..6dc24c241 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.c
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2000-2003 the xine project, 
+ * Copyright (C) 2000-2004 the xine project, 
  *                         Rich Wareham <richwareham@users.sourceforge.net>
  * 
  * This file is part of xine, a free video player.
@@ -18,7 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: input_dvd.c,v 1.193 2004/12/08 18:24:21 mroi Exp $
+ * $Id: input_dvd.c,v 1.194 2004/12/12 13:51:29 valtri Exp $
  *
  */
 
@@ -41,9 +41,9 @@
 #include <stdlib.h>
 #include <stddef.h>
 
-#ifndef _MSC_VER
+#ifndef WIN32
 #include <sys/param.h>
-#endif /* _MSC_VER */
+#endif /* WIN32 */
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -56,13 +56,13 @@
 #include <errno.h>
 #include <dlfcn.h>
 
-#ifndef _MSC_VER
+#ifndef WIN32
 #include <sys/mount.h>
 #include <sys/wait.h>
 
 #include <sys/poll.h>
 #include <sys/ioctl.h>
-#endif /* _MSC_VER */
+#endif /* WIN32 */
 
 
 #if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
diff --git a/src/video_out/alphablend.c b/src/video_out/alphablend.c
index 1d8980103..48e0bc633 100644
--- a/src/video_out/alphablend.c
+++ b/src/video_out/alphablend.c
@@ -33,7 +33,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <inttypes.h>
 
 #include "xine_internal.h"
 #include "video_out.h"
diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h
index 21070a1a9..eb4897db1 100644
--- a/src/xine-utils/xineutils.h
+++ b/src/xine-utils/xineutils.h
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xineutils.h,v 1.95 2004/10/29 23:11:38 miguelfreitas Exp $
+ * $Id: xineutils.h,v 1.96 2004/12/12 13:51:30 valtri Exp $
  *
  */
 #ifndef XINEUTILS_H
@@ -27,6 +27,10 @@
 extern "C" {
 #endif
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
@@ -40,6 +44,11 @@ extern "C" {
 #  include "xine_buffer.h"
 #  include "configfile.h"
 #else
+#  ifdef WIN32
+#    include <winsock.h>
+#  else
+#    include <sys/time.h>
+#  endif
 #  include <xine/os_types.h>
 #  include <xine/attributes.h>
 #  include <xine/compat.h>
@@ -48,10 +57,6 @@ extern "C" {
 #  include <xine/configfile.h>
 #endif
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <stdio.h>
 #include <string.h>