aboutsummaryrefslogtreecommitdiff
path: root/speex~
diff options
context:
space:
mode:
authorHans-Christoph Steiner <eighthave@users.sourceforge.net>2005-12-18 18:57:13 +0000
committerHans-Christoph Steiner <eighthave@users.sourceforge.net>2005-12-18 18:57:13 +0000
commitaa82236dd093743bd2973f8b61127582aaf6e96f (patch)
treedc74f2de6e61dc04861b8d6df53daf8ed6feb2ee /speex~
parentb13e2d6c3a525918ed0816c41433509477c9912a (diff)
lots of MinGW fixes for RC6
svn path=/trunk/externals/unauthorized/; revision=4250
Diffstat (limited to 'speex~')
-rw-r--r--speex~/speexin~.c5
-rw-r--r--speex~/speexout~.c6
2 files changed, 6 insertions, 5 deletions
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