--------------------- PatchSet 858 Date: 2003/08/09 10:21:36 Author: serassio Branch: nt Tag: (none) Log: socklen_t is not defined on MinGW Members: port/win32/include/squid-mswin.h:1.3.18.5->1.3.18.6 Index: squid3/port/win32/include/squid-mswin.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/port/win32/include/Attic/squid-mswin.h,v retrieving revision 1.3.18.5 retrieving revision 1.3.18.6 diff -u -r1.3.18.5 -r1.3.18.6 --- squid3/port/win32/include/squid-mswin.h 9 Aug 2003 07:34:17 -0000 1.3.18.5 +++ squid3/port/win32/include/squid-mswin.h 9 Aug 2003 10:21:36 -0000 1.3.18.6 @@ -1,5 +1,5 @@ /* - * $Id: squid-mswin.h,v 1.3.18.5 2003/08/09 07:34:17 serassio Exp $ + * $Id: squid-mswin.h,v 1.3.18.6 2003/08/09 10:21:36 serassio Exp $ * * AUTHOR: Guido Serassio & Andrey Shorin * @@ -51,8 +51,6 @@ typedef long off_t; typedef int ssize_t; -typedef int socklen_t; - #include "default_config_file.h" /* Some tricks for MS Compilers */ #define __STDC__ 1 @@ -492,7 +490,7 @@ } inline -int recvfrom(int s, void * b, size_t l, int f, struct sockaddr * fr, socklen_t * fl) +int recvfrom(int s, void * b, size_t l, int f, struct sockaddr * fr, int * fl) { int result; if ((result = ::recvfrom(_get_osfhandle(s), (char *)b, l, f, fr, fl)) == SOCKET_ERROR) { @@ -502,7 +500,6 @@ else return result; } -// #define recvfrom(s,b,l,f,fr,fl) Squid::recvfrom(s,b,l,f,fr,fl) inline int select(int n, fd_set * r, fd_set * w, fd_set * e, struct timeval * t)