From aa82236dd093743bd2973f8b61127582aaf6e96f Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <eighthave@users.sourceforge.net>
Date: Sun, 18 Dec 2005 18:57:13 +0000
Subject: lots of MinGW fixes for RC6

svn path=/trunk/externals/unauthorized/; revision=4250
---
 mp3live~/mp3fileout~.c   | 14 +++++++-------
 mp3live~/mp3streamin~.c  | 11 ++++++-----
 mp3live~/mp3streamout~.c | 14 +++++++-------
 3 files changed, 20 insertions(+), 19 deletions(-)

(limited to 'mp3live~')

diff --git a/mp3live~/mp3fileout~.c b/mp3live~/mp3fileout~.c
index e8e1c6b..bd2d431 100644
--- a/mp3live~/mp3fileout~.c
+++ b/mp3live~/mp3fileout~.c
@@ -36,7 +36,11 @@
 
 #include <sys/types.h>
 #include <string.h>
-#ifdef UNIX
+#ifdef _WIN32
+#include <winsock.h>
+#include <io.h>
+#include <fcntl.h>
+#else
 #include <sys/socket.h>
 #include <errno.h>
 #include <netinet/in.h>
@@ -48,13 +52,9 @@
 #include <fcntl.h>
 #include <stdio.h>
 #define SOCKET_ERROR -1
-#else
-#include <winsock.h>
-#include <io.h>
-#include <fcntl.h>
-#endif
+#endif /* _WIN32 */
 
-#if defined(__APPLE__) || defined(WIN32)
+#if defined(__APPLE__) || defined(_WIN32)
 #define MSG_NOSIGNAL 0
 #endif
 
diff --git a/mp3live~/mp3streamin~.c b/mp3live~/mp3streamin~.c
index d34150b..b01a576 100644
--- a/mp3live~/mp3streamin~.c
+++ b/mp3live~/mp3streamin~.c
@@ -40,7 +40,10 @@
 
 #include <sys/types.h>
 #include <string.h>
-#ifndef WIN32
+#ifdef _WIN32
+#include <io.h>
+#include <winsock.h>
+#else
 #include <sys/socket.h>
 #include <errno.h>
 #include <netinet/in.h>
@@ -52,11 +55,9 @@
 #include <fcntl.h>
 #include <stdio.h>
 #define SOCKET_ERROR -1
-#else
-#include <winsock.h>
-#endif
+#endif /* _WIN32 */
 
-#if defined(__APPLE__) || defined(WIN32)
+#if defined(__APPLE__) || defined(_WIN32)
 #define MSG_NOSIGNAL 0
 #define SOL_TCP IPPROTO_TCP
 #endif
diff --git a/mp3live~/mp3streamout~.c b/mp3live~/mp3streamout~.c
index 0ed908a..33555ce 100644
--- a/mp3live~/mp3streamout~.c
+++ b/mp3live~/mp3streamout~.c
@@ -40,7 +40,12 @@
 #include <malloc.h>
 #endif
 #include <ctype.h>
-#ifdef UNIX
+#ifdef _WIN32
+#include <io.h>
+#include <windows.h>
+#include <winsock.h>
+#include <windef.h>
+#else
 #include <unistd.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -48,14 +53,9 @@
 #include <time.h>
 #include <sys/time.h>
 #define SOCKET_ERROR -1
-#else
-#include <io.h>
-#include <windows.h>
-#include <winsock.h>
-#include <windef.h>
 #endif
 
-#if defined(__APPLE__) || defined(WIN32)
+#if defined(__APPLE__) || defined(_WIN32)
 #define MSG_NOSIGNAL 0
 #endif
 
-- 
cgit v1.2.1