From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 24 Feb 2013 06:27:46 +0000 (-0700)
Subject: Fix shadowed definition of socket in librfcnb headers
X-Git-Tag: SQUID_3_4_0_1~257
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bcc17f9c0c2d3fe4e17eb2709e24a747ce6065f9;p=thirdparty%2Fsquid.git

Fix shadowed definition of socket in librfcnb headers

Detected by MacOS X build node.
---

diff --git a/lib/rfcnb/rfcnb-util.h b/lib/rfcnb/rfcnb-util.h
index 1fe1a4a8f1..adf9ffa8e6 100644
--- a/lib/rfcnb/rfcnb-util.h
+++ b/lib/rfcnb/rfcnb-util.h
@@ -35,7 +35,7 @@ void RFCNB_Print_Pkt(FILE * fd, char *dirn, struct RFCNB_Pkt *pkt, int len);
 
 int RFCNB_Name_To_IP(char *host, struct in_addr *Dest_IP);
 
-int RFCNB_Close(int socket);
+int RFCNB_Close(int fd);
 
 int RFCNB_IP_Connect(struct in_addr Dest_IP, int port);