r4164 - branches/2.0/varnish-cache/lib/libvarnish

[sky at projects.linpro.no]

Author: sky
Date: 2009-07-30 09:10:55 +0200 (Thu, 30 Jul 2009)
New Revision: 4164

Modified:
   branches/2.0/varnish-cache/lib/libvarnish/tcp.c
Log:
revert merge r4162

Modified: branches/2.0/varnish-cache/lib/libvarnish/tcp.c
===================================================================
--- branches/2.0/varnish-cache/lib/libvarnish/tcp.c	2009-07-30 07:06:48 UTC (rev 4163)
+++ branches/2.0/varnish-cache/lib/libvarnish/tcp.c	2009-07-30 07:10:55 UTC (rev 4164)
@@ -56,11 +56,6 @@
 
 #include "libvarnish.h"
 
-/* Solaris can't use the ioctl" */
-#ifdef __sun
-#include <fcntl.h>
-#endif
-
 /*--------------------------------------------------------------------*/
 
 void
@@ -131,9 +126,6 @@
  * us to do two syscalls, one to get and one to set, the latter of
  * which mucks about a bit before it ends up calling ioctl(FIONBIO),
  * at least on FreeBSD.
- *
- * On some platforms we need to use fcntl because the ioctl is unreliable
- * The one that we know this is the case for is solaris.
  */
 
 void
@@ -141,13 +133,8 @@
 {
 	int i;
 
-#ifdef __sun
-	i = fcntl (sock, F_GETFL,0);
-	fcntl(sock, F_SETFL, i & ~O_NONBLOCK);
-#else
 	i = 0;
 	AZ(ioctl(sock, FIONBIO, &i));
-#endif
 }
 
 void
@@ -155,13 +142,8 @@
 {
 	int i;
 
-#ifdef __sun
-	i = fcntl (sock, F_GETFL,0);
-	fcntl(sock, F_SETFL, i | O_NONBLOCK);
-#else
 	i = 1;
 	AZ(ioctl(sock, FIONBIO, &i));
-#endif
 }
 
 /*--------------------------------------------------------------------