From: Guido Serassio <serassio@squid-cache.org>
Date: Tue, 2 Jun 2009 09:59:51 +0000 (+0200)
Subject: Fix TCP and UDP buffer size detection
X-Git-Tag: SQUID_3_2_0_1~978
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eab7694ab13afa6213170d4c90599f8c8e30eb86;p=thirdparty%2Fsquid.git

Fix TCP and UDP buffer size detection

After the switch to C++ of configure.in, some tests must be revised, maybe
that they are still some other always failing test.
---

diff --git a/configure.in b/configure.in
index 54e3dec4a4..bc4bf37739 100644
--- a/configure.in
+++ b/configure.in
@@ -3441,10 +3441,13 @@ AC_TRY_RUN([
 main ()
 {
 	FILE *fp;
-        int fd,val=0,len=sizeof(int);
+        int fd,val=0;
 #if (defined(WIN32) || defined(__WIN32__) || defined(__WIN32)) && !(defined(__CYGWIN32__) || defined(__CYGWIN__))
+        int len=sizeof(int);
 	WSADATA wsaData;
 	WSAStartup(2, &wsaData);
+#else
+        socklen_t len=sizeof(socklen_t);
 #endif
 	if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) exit(1);
 #if (defined(WIN32) || defined(__WIN32__) || defined(__WIN32)) && !(defined(__CYGWIN32__) || defined(__CYGWIN__))
@@ -3486,10 +3489,13 @@ AC_TRY_RUN([
 main ()
 {
 	FILE *fp;
-        int fd,val=0,len=sizeof(int);
+        int fd,val=0;
 #if (defined(WIN32) || defined(__WIN32__) || defined(__WIN32)) && !(defined(__CYGWIN32__) || defined(__CYGWIN__))
+        int len=sizeof(int);
 	WSADATA wsaData;
 	WSAStartup(2, &wsaData);
+#else
+        socklen_t len=sizeof(socklen_t);
 #endif
 	if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) exit(1);
 #if (defined(WIN32) || defined(__WIN32__) || defined(__WIN32)) && !(defined(__CYGWIN32__) || defined(__CYGWIN__))
@@ -3531,10 +3537,13 @@ AC_TRY_RUN([
 main ()
 {
 	FILE *fp;
-        int fd,val=0,len=sizeof(int);
+        int fd,val=0;
 #if (defined(WIN32) || defined(__WIN32__) || defined(__WIN32)) && !(defined(__CYGWIN32__) || defined(__CYGWIN__))
+        int len=sizeof(int);
 	WSADATA wsaData;
 	WSAStartup(2, &wsaData);
+#else
+        socklen_t len=sizeof(socklen_t);
 #endif
 	if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) exit(1);
 #if (defined(WIN32) || defined(__WIN32__) || defined(__WIN32)) && !(defined(__CYGWIN32__) || defined(__CYGWIN__))
@@ -3580,10 +3589,13 @@ AC_TRY_RUN([
 main ()
 {
 	FILE *fp;
-        int fd,val=0,len=sizeof(int);
+        int fd,val=0;
 #if (defined(WIN32) || defined(__WIN32__) || defined(__WIN32)) && !(defined(__CYGWIN32__) || defined(__CYGWIN__))
+        int len=sizeof(int);
 	WSADATA wsaData;
 	WSAStartup(2, &wsaData);
+#else
+        socklen_t len=sizeof(socklen_t);
 #endif
 	if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) exit(1);
 #if (defined(WIN32) || defined(__WIN32__) || defined(__WIN32)) && !(defined(__CYGWIN32__) || defined(__CYGWIN__))