From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 19 May 2010 11:42:48 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: take08~55^2~124^2~149
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0679d1c858488d120c8779b70af7fe442e102072;p=thirdparty%2Fsquid.git

Merge from trunk
---

0679d1c858488d120c8779b70af7fe442e102072
diff --cc src/comm.h
index f14c3a755d,331def76f0..ac63caf6e6
--- a/src/comm.h
+++ b/src/comm.h
@@@ -13,8 -11,24 +13,7 @@@
  #define COMMIO_FD_READCB(fd)    (&commfd_table[(fd)].readcb)
  #define COMMIO_FD_WRITECB(fd)   (&commfd_table[(fd)].writecb)
  
 -typedef enum {
 -    COMM_OK = 0,
 -    COMM_ERROR = -1,
 -    COMM_NOMESSAGE = -3,
 -    COMM_TIMEOUT = -4,
 -    COMM_SHUTDOWN = -5,
 -    COMM_IDLE = -6, /* there are no active fds and no pending callbacks. */
 -    COMM_INPROGRESS = -7,
 -    COMM_ERR_CONNECT = -8,
 -    COMM_ERR_DNS = -9,
 -    COMM_ERR_CLOSING = -10,
 -    COMM_ERR_PROTOCOL = -11, /* IPv4 or IPv6 cannot be used on the fd socket */
 -    COMM_ERR__END__ = -999999 /* Dummy entry to make syntax valid (comma on line above), do not use. New entries added above */
 -} comm_err_t;
 -
 -class DnsLookupDetails;
 -typedef void CNCB(int fd, const DnsLookupDetails &dns, comm_err_t status, int xerrno, void *data);
 -
 +typedef void CNCB(Comm::Connection *conn, Vector<Comm::Connection*> *paths, comm_err_t status, int xerrno, void *data);
- 
  typedef void IOCB(int fd, char *, size_t size, comm_err_t flag, int xerrno, void *data);