HEAD broken after latest clientStreams merge

Hi Robert,

I have just merged nt branch with HEAD, but I'm not more able to compile Squid.

I have fixed a problem in comm_select.c:

Index: src/comm_select.c
===================================================================
RCS file: /cvsroot/squid/squid/src/comm_select.c,v
retrieving revision 1.9.8.6
diff -u -p -r1.9.8.6 comm_select.c
--- src/comm_select.c 15 Sep 2002 14:12:12 -0000 1.9.8.6
+++ src/comm_select.c 15 Sep 2002 14:36:16 -0000
@@ -776,15 +776,15 @@ examine_select(fd_set * readfds, fd_set
             F->timeout_handler,
             F->read_handler,
             F->write_handler);
- for (ch = F->close_handler; ch; ch = ch->next)
+ for (ch = F->closeHandler; ch; ch = ch->next)
             debug(5, 0) (" close handler: %p\n", ch->handler);
- if (F->close_handler) {
+ if (F->closeHandler) {
             commCallCloseHandlers(fd);
         } else if (F->timeout_handler) {
             debug(5, 0) ("examine_select: Calling Timeout Handler\n");
             F->timeout_handler(fd, F->timeout_data);
         }
- F->close_handler = NULL;
+ F->closeHandler = NULL;
         F->timeout_handler = NULL;
         F->read_handler = NULL;
         F->write_handler = NULL;

But there are still theses error that I don't understand to fix:

Compiling...
comm_select.c
client_side_request.c
C:\work\nt\src\client_side_request.c(462) : error C2039: 'sin_addr' : is
not a member of 'in_addr'
         D:\Programmi\Microsoft SDK\include\winsock2.h(338) : see
declaration of 'in_addr'
C:\work\nt\src\client_side_request.c(462) : error C2065: 'noaddr' :
undeclared identifier
C:\work\nt\src\client_side_request.c(462) : error C2198: 'fqdnFromAddr' :
too few actual parameters
client_side_reply.c
C:\work\nt\src\client_side_reply.c(1314) : error C2039: 'sc' : is not a
member of '_clientHttpRequest'
         C:\work\nt\src\structs.h(1064) : see declaration of
'_clientHttpRequest'
C:\work\nt\src\client_side_reply.c(1314) : warning C4047: 'function' :
'struct _store_client *' differs in levels of indirection from 'unsigned int '
C:\work\nt\src\client_side_reply.c(1314) : warning C4024:
'delaySetStoreClient' : different types for formal and actual parameter 1
C:\work\nt\src\client_side_reply.c(1314) : error C2198:
'delaySetStoreClient' : too few actual parameters
C:\work\nt\src\client_side_reply.c(1318) : warning C4018: '==' :
signed/unsigned mismatch
C:\work\nt\src\client_side_reply.c(1361) : warning C4018: '<=' :
signed/unsigned mismatch
C:\work\nt\src\client_side_reply.c(1526) : warning C4018: '>' :
signed/unsigned mismatch

Regards

Guido

-
=======================================================
Serassio Guido
Via Albenga, 11/4 10134 - Torino - ITALY
E-mail: guido.serassio@serassio.it
WWW: http://www.serassio.it
Received on Sun Sep 15 2002 - 08:41:03 MDT