--- old/connect.c	Thu Oct  4 17:27:37 2001
+++ connect.c	Thu Oct  4 17:26:37 2001
@@ -332,7 +332,7 @@
 CURLcode Curl_connecthost(struct connectdata *conn,  /* context */
                           Curl_addrinfo *remotehost, /* use one in here */
                           int port,              /* connect to this */
-                          int *socket,           /* the connected socket */
+                          int *sockconn,           /* the connected socket */
                           Curl_ipconnect **addr) /* the one we used */
 {
   struct SessionHandle *data = conn->data;
@@ -531,7 +531,7 @@
   if(-1 == rc) {
     /* no good connect was made */
     sclose(sockfd);
-    *socket = -1;
+    *sockconn = -1;
     return CURLE_COULDNT_CONNECT;
   }

@@ -544,8 +544,8 @@
 #endif

   /* allow NULL-pointers to get passed in */
-  if(socket)
-    *socket = sockfd;    /* the socket descriptor we've connected */
+  if(sockconn)
+    *sockconn = sockfd;    /* the socket descriptor we've connected */

   return CURLE_OK;
 }