r4000 - branches/2.0/varnish-cache/include

tfheen at projects.linpro.no tfheen at projects.linpro.no
Mon Mar 23 16:02:33 CET 2009


Author: tfheen
Date: 2009-03-23 16:02:33 +0100 (Mon, 23 Mar 2009)
New Revision: 4000

Modified:
   branches/2.0/varnish-cache/include/libvarnish.h
Log:
Merge r3982: rename socket since it collides with a osx header definition and therefore fails Werror



Modified: branches/2.0/varnish-cache/include/libvarnish.h
===================================================================
--- branches/2.0/varnish-cache/include/libvarnish.h	2009-03-23 14:51:24 UTC (rev 3999)
+++ branches/2.0/varnish-cache/include/libvarnish.h	2009-03-23 15:02:33 UTC (rev 4000)
@@ -71,7 +71,7 @@
 int TCP_connect(int s, const struct sockaddr *name, socklen_t namelen,
     int msec);
 void TCP_close(int *s);
-void TCP_set_read_timeout(int socket, double seconds);
+void TCP_set_read_timeout(int s, double seconds);
 #endif
 
 /* from libvarnish/time.c */



More information about the varnish-commit mailing list