summaryrefslogtreecommitdiffstats
path: root/Source/CTest/Curl/connect.h
diff options
context:
space:
mode:
authorAndy Cedilnik <andy.cedilnik@kitware.com>2004-10-05 13:34:20 (GMT)
committerAndy Cedilnik <andy.cedilnik@kitware.com>2004-10-05 13:34:20 (GMT)
commit609801fe67c95f9959468df8316a8f4a26943842 (patch)
treebe2cf804edae61b76806c95bf0965985e4f45aed /Source/CTest/Curl/connect.h
parent50da0328472ad0f318f64a20876c474ad968fef3 (diff)
downloadCMake-609801fe67c95f9959468df8316a8f4a26943842.zip
CMake-609801fe67c95f9959468df8316a8f4a26943842.tar.gz
CMake-609801fe67c95f9959468df8316a8f4a26943842.tar.bz2
ENH: Update Curl to 7.12.1
Diffstat (limited to 'Source/CTest/Curl/connect.h')
-rw-r--r--Source/CTest/Curl/connect.h26
1 files changed, 15 insertions, 11 deletions
diff --git a/Source/CTest/Curl/connect.h b/Source/CTest/Curl/connect.h
index fdbecec..d39495c 100644
--- a/Source/CTest/Curl/connect.h
+++ b/Source/CTest/Curl/connect.h
@@ -1,18 +1,18 @@
#ifndef __CONNECT_H
#define __CONNECT_H
/***************************************************************************
- * _ _ ____ _
- * Project ___| | | | _ \| |
- * / __| | | | |_) | |
- * | (__| |_| | _ <| |___
+ * _ _ ____ _
+ * Project ___| | | | _ \| |
+ * / __| | | | |_) | |
+ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2002, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
* are also available at http://curl.haxx.se/docs/copyright.html.
- *
+ *
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
* furnished to do so, under the terms of the COPYING file.
@@ -23,18 +23,22 @@
* $Id$
***************************************************************************/
-int Curl_nonblock(int socket, /* operate on this */
+int Curl_nonblock(curl_socket_t sockfd, /* operate on this */
int nonblock /* TRUE or FALSE */);
CURLcode Curl_is_connected(struct connectdata *conn,
- int sockfd,
+ int sockindex,
bool *connected);
CURLcode Curl_connecthost(struct connectdata *conn,
struct Curl_dns_entry *host, /* connect to this */
- int port, /* connect to this port number */
- int *sockconn, /* not set if error is returned */
- Curl_ipconnect **addr, /* the one we used */
+ curl_socket_t *sockconn, /* not set if error */
+ Curl_addrinfo **addr, /* the one we used */
bool *connected /* truly connected? */
);
+
+int Curl_ourerrno(void);
+
+#define DEFAULT_CONNECT_TIMEOUT 300000 /* milliseconds == five minutes */
+
#endif