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
---
 speex~/speexin~.c  | 5 +++--
 speex~/speexout~.c | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'speex~')

diff --git a/speex~/speexin~.c b/speex~/speexin~.c
index 786a9e7..eff2601 100644
--- a/speex~/speexin~.c
+++ b/speex~/speexin~.c
@@ -33,7 +33,8 @@
 #include <sys/types.h>
 #include <string.h>
 #include <stdlib.h>
-#ifdef WIN32
+#ifdef _WIN32
+#include <io.h>
 #include <winsock.h>
 #else
 #include <sys/socket.h>
@@ -49,7 +50,7 @@
 #define SOCKET_ERROR -1
 #endif
 
-#if defined(__APPLE__) || defined(WIN32)
+#if defined(__APPLE__) || defined(_WIN32)
 #define MSG_NOSIGNAL 0
 #define SOL_TCP IPPROTO_TCP
 #endif
diff --git a/speex~/speexout~.c b/speex~/speexout~.c
index 2d2c104..2391e6f 100644
--- a/speex~/speexout~.c
+++ b/speex~/speexout~.c
@@ -31,7 +31,7 @@
 
 
 
-#ifdef NT
+#ifdef _MSC_VER
 #pragma warning( disable : 4244 )
 #pragma warning( disable : 4305 )
 #endif
@@ -47,7 +47,7 @@
 #include <malloc.h>
 #endif
 #include <ctype.h>
-#ifdef WIN32
+#ifdef _WIN32
 #include <io.h>
 #include <windows.h>
 #include <winsock.h>
@@ -62,7 +62,7 @@
 #define SOCKET_ERROR -1
 #endif
 
-#if defined(__APPLE__) || defined(WIN32)
+#if defined(__APPLE__) || defined(_WIN32)
 #define MSG_NOSIGNAL 0
 #endif
 
-- 
cgit v1.2.1