[xine-cvs] CVS: xine-lib/src/xine-engine audio_decoder.c,1.123,1.124 audio_out.c,1.165,1.166 broadcaster.c,1.6,1.7 io_helper.c,1.9,1.10 osd.h,1.24,1.25

[Frantisek D. <va...@us...>]

Update of /cvsroot/xine/xine-lib/src/xine-engine
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19383/src/xine-engine

Modified Files:
	audio_decoder.c audio_out.c broadcaster.c io_helper.c osd.h 
Log Message:
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


Index: audio_decoder.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/xine-engine/audio_decoder.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- audio_decoder.c	12 Mar 2004 14:53:16 -0000	1.123
+++ audio_decoder.c	14 Mar 2004 09:38:03 -0000	1.124
@@ -30,6 +30,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdint.h>
 #include <sched.h>
 #include <unistd.h>
 

Index: audio_out.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/xine-engine/audio_out.c,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- audio_out.c	8 Mar 2004 18:33:54 -0000	1.165
+++ audio_out.c	14 Mar 2004 09:38:03 -0000	1.166
@@ -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>

Index: broadcaster.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/xine-engine/broadcaster.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- broadcaster.c	3 Mar 2004 20:09:16 -0000	1.6
+++ broadcaster.c	14 Mar 2004 09:38:03 -0000	1.7
@@ -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>

Index: io_helper.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/xine-engine/io_helper.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- io_helper.c	5 Dec 2003 15:55:04 -0000	1.9
+++ io_helper.c	14 Mar 2004 09:38:03 -0000	1.10
@@ -66,7 +66,7 @@
     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;

Index: osd.h
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/xine-engine/osd.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- osd.h	12 Feb 2004 18:19:12 -0000	1.24
+++ osd.h	14 Mar 2004 09:38:03 -0000	1.25
@@ -24,9 +24,9 @@
 #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 @@
 
   int32_t handle;
 
-#ifndef _MSC_VER
+#ifdef HAVE_ICONV
   iconv_t cd;                           /* iconv handle of encoding */
   char *encoding;                       /* name of encoding */
 #endif