Merge pull request #2 from meh2481/master

Fix include order for MinGW Windows
This commit is contained in:
fgenesis 2014-03-27 02:25:32 +01:00
commit 677000b533

View file

@ -10,15 +10,8 @@
# endif # endif
#endif #endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sstream>
#include <cctype>
#include <cerrno>
#include <algorithm>
#ifdef _WIN32 #ifdef _WIN32
# undef UNICODE
# ifndef _WIN32_WINNT # ifndef _WIN32_WINNT
# define _WIN32_WINNT 0x0501 # define _WIN32_WINNT 0x0501
# endif # endif
@ -28,6 +21,7 @@
# define ETIMEDOUT WSAETIMEDOUT # define ETIMEDOUT WSAETIMEDOUT
# define ECONNRESET WSAECONNRESET # define ECONNRESET WSAECONNRESET
# define ENOTCONN WSAENOTCONN # define ENOTCONN WSAENOTCONN
# include <io.h>
#else #else
# include <sys/types.h> # include <sys/types.h>
# include <unistd.h> # include <unistd.h>
@ -39,6 +33,14 @@
typedef intptr_t SOCKET; typedef intptr_t SOCKET;
#endif #endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sstream>
#include <cctype>
#include <cerrno>
#include <algorithm>
#include "minihttp.h" #include "minihttp.h"
#define SOCKETVALID(s) ((s) != INVALID_SOCKET) #define SOCKETVALID(s) ((s) != INVALID_SOCKET)