From 513b66997b1a0c4e804c13b6840ccd7a7de41ad9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?=
 <valtri@users.sourceforge.net>
Date: Sun, 14 Mar 2004 09:38:03 +0000
Subject: Update WIN32 port:   - add stdint.h with INT16_MIN/MAX   - apply
 forgotten change _MSC_VER -> HAVE_ICONV   - get rid of some _MSC_VER -
 changed to WIN32 since it'll be used by MINGW too

CVS patchset: 6249
CVS date: 2004/03/14 09:38:03
---
 src/xine-engine/audio_decoder.c | 3 ++-
 src/xine-engine/audio_out.c     | 3 ++-
 src/xine-engine/broadcaster.c   | 6 +++---
 src/xine-engine/io_helper.c     | 2 +-
 src/xine-engine/osd.h           | 8 ++++----
 5 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/xine-engine/audio_decoder.c b/src/xine-engine/audio_decoder.c
index 3e6401b17..6232c7f5c 100644
--- a/src/xine-engine/audio_decoder.c
+++ b/src/xine-engine/audio_decoder.c
@@ -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: audio_decoder.c,v 1.123 2004/03/12 14:53:16 miguelfreitas Exp $
+ * $Id: audio_decoder.c,v 1.124 2004/03/14 09:38:03 valtri Exp $
  *
  *
  * functions that implement audio decoding
@@ -30,6 +30,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdint.h>
 #include <sched.h>
 #include <unistd.h>
 
diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c
index 4e66b4ad8..90d116416 100644
--- a/src/xine-engine/audio_out.c
+++ b/src/xine-engine/audio_out.c
@@ -17,7 +17,7 @@
  * along with self program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: audio_out.c,v 1.165 2004/03/08 18:33:54 jcdutton Exp $
+ * $Id: audio_out.c,v 1.166 2004/03/14 09:38:03 valtri Exp $
  *
  * 22-8-2001 James imported some useful AC3 sections from the previous alsa driver.
  *   (c) 2001 Andy Lo A Foe <andy@alsaplayer.org>
@@ -71,6 +71,7 @@
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <fcntl.h>
 #include <math.h>
 #include <unistd.h>
diff --git a/src/xine-engine/broadcaster.c b/src/xine-engine/broadcaster.c
index 95fa1cb9e..4b203ffb3 100644
--- a/src/xine-engine/broadcaster.c
+++ b/src/xine-engine/broadcaster.c
@@ -19,7 +19,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: broadcaster.c,v 1.6 2004/03/03 20:09:16 mroi Exp $
+ * $Id: broadcaster.c,v 1.7 2004/03/14 09:38:03 valtri Exp $
  * 
  * broadcaster.c - xine network broadcaster
  *
@@ -51,11 +51,11 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 
-#ifndef _MSC_VER
+#ifndef WIN32
 #include <sys/ioctl.h>
 #include <arpa/inet.h>
 #include <netdb.h>
-#endif /* _MSC_VER */
+#endif
 
 #include <dlfcn.h>
 #include <pthread.h>
diff --git a/src/xine-engine/io_helper.c b/src/xine-engine/io_helper.c
index f631a0736..9f14559b5 100644
--- a/src/xine-engine/io_helper.c
+++ b/src/xine-engine/io_helper.c
@@ -66,7 +66,7 @@ static int _x_io_tcp_connect_ipv4(xine_stream_t *stream, const char *host, int p
     return -1;
   }
 
-#ifndef _MSC_VER
+#ifndef WIN32
   if (fcntl (s, F_SETFL, fcntl (s, F_GETFL) | O_NONBLOCK) == -1) {
     _x_message(stream, XINE_MSG_CONNECTION_REFUSED, "can't put socket in non-blocking mode", strerror(errno), NULL);
     return -1;
diff --git a/src/xine-engine/osd.h b/src/xine-engine/osd.h
index fc1a31bca..b50b1f1f4 100644
--- a/src/xine-engine/osd.h
+++ b/src/xine-engine/osd.h
@@ -18,15 +18,15 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
  * OSD stuff (text and graphic primitives)
- * $Id: osd.h,v 1.24 2004/02/12 18:19:12 mroi Exp $
+ * $Id: osd.h,v 1.25 2004/03/14 09:38:03 valtri Exp $
  */
 
 #ifndef HAVE_OSD_H
 #define HAVE_OSD_H
 
-#ifndef _MSC_VER 
+#ifdef HAVE_ICONV
 #  include <iconv.h>
-#endif /* _MSC_VER */
+#endif
 
 #ifdef XINE_COMPILE
 #  include "video_overlay.h"
@@ -59,7 +59,7 @@ struct osd_object_s {
 
   int32_t handle;
 
-#ifndef _MSC_VER
+#ifdef HAVE_ICONV
   iconv_t cd;                           /* iconv handle of encoding */
   char *encoding;                       /* name of encoding */
 #endif
-- 
cgit v1.2.3