From b0f97ddf10ba7f0e6a3b39154c94f34431095c48 Mon Sep 17 00:00:00 2001 From: martell Date: Wed, 22 Jan 2014 18:52:19 +0000 Subject: [PATCH] removed needless __MINGW64__ #defines --- lib/libwebsockets.c | 4 ---- lib/private-libwebsockets.h | 6 ------ win32port/win32helpers/websock-w32.c | 8 -------- win32port/win32helpers/websock-w32.h | 3 --- 4 files changed, 21 deletions(-) diff --git a/lib/libwebsockets.c b/lib/libwebsockets.c index 18b500993..7fbee38bb 100644 --- a/lib/libwebsockets.c +++ b/lib/libwebsockets.c @@ -45,10 +45,6 @@ int openssl_websocket_private_data_index; #ifdef __MINGW32__ #include "../win32port/win32helpers/websock-w32.c" -#else -#ifdef __MINGW64__ -#include "../win32port/win32helpers/websock-w32.c" -#endif #endif #ifndef LWS_BUILD_HASH diff --git a/lib/private-libwebsockets.h b/lib/private-libwebsockets.h index 332416b18..04b0bbb5f 100644 --- a/lib/private-libwebsockets.h +++ b/lib/private-libwebsockets.h @@ -43,14 +43,11 @@ #include #include #include -#ifdef __MINGW64__ -#else #ifdef __MINGW32__ #elif _MSC_VER > 1000 || defined(_WIN32) #else #include #endif -#endif #include #include @@ -71,13 +68,10 @@ #endif #define compatible_close(fd) closesocket(fd); -#ifdef __MINGW64__ -#else #ifdef __MINGW32__ #else #include #endif -#endif #include #include #include diff --git a/win32port/win32helpers/websock-w32.c b/win32port/win32helpers/websock-w32.c index ec3022e93..c45244f09 100644 --- a/win32port/win32helpers/websock-w32.c +++ b/win32port/win32helpers/websock-w32.c @@ -1,14 +1,6 @@ #define FD_SETSIZE 256 -#ifdef __MINGW32__ #include -#else -#ifdef __MINGW64__ -#include -#else -#include -#endif -#endif #include #include diff --git a/win32port/win32helpers/websock-w32.h b/win32port/win32helpers/websock-w32.h index 978488939..cf11103bf 100644 --- a/win32port/win32helpers/websock-w32.h +++ b/win32port/win32helpers/websock-w32.h @@ -19,9 +19,6 @@ #define random rand #define usleep _sleep -#ifdef __MINGW64__ -#define DEF_POLL_STUFF -#endif #ifdef __MINGW32__ #define DEF_POLL_STUFF #endif