---------------------
PatchSet 5887 
Date: 2007/10/06 20:49:07
Author: serassio
Branch: squid3-ipv6
Tag: (none) 
Log:
Update the "Windows glue" for IPv6 changes

Members: 
	include/squid_mswin.h:1.4.2.4->1.4.2.5 
	lib/GNUregex.c:1.5.4.1->1.5.4.2 

Index: squid3/include/squid_mswin.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/include/squid_mswin.h,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -u -r1.4.2.4 -r1.4.2.5
--- squid3/include/squid_mswin.h	26 Sep 2007 03:13:27 -0000	1.4.2.4
+++ squid3/include/squid_mswin.h	6 Oct 2007 20:49:07 -0000	1.4.2.5
@@ -1,5 +1,5 @@
 /*
- * $Id: squid_mswin.h,v 1.4.2.4 2007/09/26 03:13:27 amosjeffries Exp $
+ * $Id: squid_mswin.h,v 1.4.2.5 2007/10/06 20:49:07 serassio Exp $
  *
  * AUTHOR: Andrey Shorin <tolsty@tushino.com>
  * AUTHOR: Guido Serassio <serassio@squid-cache.org>
@@ -211,6 +211,7 @@
 #include <stddef.h>
 #include <process.h>
 #include <errno.h>
+#include <ws2tcpip.h>
 #if defined(_MSC_VER) /* Microsoft C Compiler ONLY */
 /* Hack to suppress compiler warnings on FD_SET() & FD_CLR() */
 #pragma warning (push)
@@ -243,6 +244,7 @@
 #define ECONNRESET WSAECONNRESET
 #define ENOTCONN WSAENOTCONN
 #define ERESTART WSATRY_AGAIN
+#define EAFNOSUPPORT WSAEAFNOSUPPORT
 
 #undef h_errno
 #define h_errno errno /* we'll set it ourselves */
@@ -392,10 +394,10 @@
 namespace Squid {
 
 inline
-int accept(int s, struct sockaddr * a, int * l)
+int accept(int s, struct sockaddr * a, size_t * l)
 {
     SOCKET result;
-    if ((result = ::accept(_get_osfhandle(s), a, l)) == INVALID_SOCKET) {
+    if ((result = ::accept(_get_osfhandle(s), a, (int *)l)) == INVALID_SOCKET) {
 	if (WSAEMFILE == (errno = WSAGetLastError()))
 	    errno = EMFILE;
 	return -1;
@@ -458,9 +460,9 @@
 #define gethostbyaddr(a,l,t) Squid::gethostbyaddr(a,l,t)
 
 inline
-int getsockname(int s, struct sockaddr * n, int * l)
+int getsockname(int s, struct sockaddr * n, size_t * l)
 {
-    if ((::getsockname(_get_osfhandle(s), n, l)) == SOCKET_ERROR) {
+    if ((::getsockname(_get_osfhandle(s), n, (int *)l)) == SOCKET_ERROR) {
 	errno = WSAGetLastError();
 	return -1;
     }
@@ -541,10 +543,10 @@
 }
 
 inline
-int recvfrom(int s, void * b, size_t l, int f, struct sockaddr * fr, int * fl)
+int recvfrom(int s, void * b, size_t l, int f, struct sockaddr * fr, size_t * fl)
 {
     int result;
-    if ((result = ::recvfrom(_get_osfhandle(s), (char *)b, l, f, fr, fl)) == SOCKET_ERROR) {
+    if ((result = ::recvfrom(_get_osfhandle(s), (char *)b, l, f, fr, (int *)fl)) == SOCKET_ERROR) {
 	errno = WSAGetLastError();
 	return -1;
     }
Index: squid3/lib/GNUregex.c
===================================================================
RCS file: /cvsroot/squid-sf//squid3/lib/GNUregex.c,v
retrieving revision 1.5.4.1
retrieving revision 1.5.4.2
diff -u -r1.5.4.1 -r1.5.4.2
--- squid3/lib/GNUregex.c	5 Jan 2007 16:57:39 -0000	1.5.4.1
+++ squid3/lib/GNUregex.c	6 Oct 2007 20:49:07 -0000	1.5.4.2
@@ -1,5 +1,5 @@
 /*
- * $Id: GNUregex.c,v 1.5.4.1 2007/01/05 16:57:39 hno Exp $
+ * $Id: GNUregex.c,v 1.5.4.2 2007/10/06 20:49:07 serassio Exp $
  */
 
 /* Extended regular expression matching and search library,
@@ -247,7 +247,9 @@
 #define MAX(a, b) ((a) > (b) ? (a) : (b))
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
 
+#if !defined(__MINGW32__)	/* MinGW defines boolean */
 typedef char boolean;
+#endif
 #define false 0
 #define true 1