diff options
| author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2005-12-18 18:57:13 +0000 |
|---|---|---|
| committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2005-12-18 18:57:13 +0000 |
| commit | aa82236dd093743bd2973f8b61127582aaf6e96f (patch) | |
| tree | dc74f2de6e61dc04861b8d6df53daf8ed6feb2ee /mp3live~ | |
| parent | b13e2d6c3a525918ed0816c41433509477c9912a (diff) | |
lots of MinGW fixes for RC6
svn path=/trunk/externals/unauthorized/; revision=4250
Diffstat (limited to 'mp3live~')
| -rw-r--r-- | mp3live~/mp3fileout~.c | 14 | ||||
| -rw-r--r-- | mp3live~/mp3streamin~.c | 11 | ||||
| -rw-r--r-- | mp3live~/mp3streamout~.c | 14 |
3 files changed, 20 insertions, 19 deletions
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 |