Revision: 14588 Author: adrian.chadd Date: Sun Apr 11 04:19:29 2010 Log: Issue #94 - portability changes for mingw:
* undef FD_SETSIZE before redefining it * shuffle io.h/stdlib.h include order so it doesn't error out for me * change WIN32_WINNT to 0x0501 so the ipv6 specific stuff is included http://code.google.com/p/lusca-cache/source/detail?r=14588 Modified: /branches/LUSCA_HEAD/include/squid_mswin.h ======================================= --- /branches/LUSCA_HEAD/include/squid_mswin.h Thu Jun 26 05:09:24 2008 +++ /branches/LUSCA_HEAD/include/squid_mswin.h Sun Apr 11 04:19:29 2010 @@ -36,7 +36,7 @@ #define STDC_HEADERS 1 #endif -#define _WIN32_WINNT 0x0500 +#define _WIN32_WINNT 0x0501 #if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS == 64 # define __USE_FILE_OFFSET64 1 @@ -116,6 +116,9 @@ #define vsnprintf _vsnprintf #endif +#include <io.h> +#include <stdlib.h> + #define O_RDONLY _O_RDONLY #define O_WRONLY _O_WRONLY #define O_RDWR _O_RDWR @@ -229,6 +232,7 @@ #define CHANGE_FD_SETSIZE 1 #if CHANGE_FD_SETSIZE && SQUID_MAXFD > DEFAULT_FD_SETSIZE +#undef FD_SETSIZE #define FD_SETSIZE SQUID_MAXFD #endif @@ -245,8 +249,6 @@ #if defined(_MSC_VER) /* Microsoft C Compiler ONLY */ #pragma warning (pop) #endif -#include <io.h> -#include <stdlib.h> typedef char * caddr_t; -- You received this message because you are subscribed to the Google Groups "lusca-commit" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/lusca-commit?hl=en.
