generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NTLM: header inclusion cleanup follow-up

Browse Source
This commit is contained in:
Yang Tse 2011-08-28 11:29:09 +02:00
parent 05ef245170
commit 78199b6030
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/gtls.h
View File

@ -1,5 +1,5 @@
#ifndef __GTLS_H #ifndef HEADER_CURL_GTLS_H
#define __GTLS_H #define HEADER_CURL_GTLS_H
/*************************************************************************** /***************************************************************************
* _ _ ____ _ * _ _ ____ _
* Project ___| | | | _ \| | * Project ___| | | | _ \| |
@ -22,8 +22,12 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h"
#ifdef USE_GNUTLS #ifdef USE_GNUTLS
#include "urldata.h"
int Curl_gtls_init(void); int Curl_gtls_init(void);
int Curl_gtls_cleanup(void); int Curl_gtls_cleanup(void);
CURLcode Curl_gtls_connect(struct connectdata *conn, int sockindex); CURLcode Curl_gtls_connect(struct connectdata *conn, int sockindex);
@ -60,4 +64,4 @@ int Curl_gtls_seed(struct SessionHandle *data);
#define curlssl_data_pending(x,y) (x=x, y=y, 0) #define curlssl_data_pending(x,y) (x=x, y=y, 0)
#endif /* USE_GNUTLS */ #endif /* USE_GNUTLS */
#endif #endif /* HEADER_CURL_GTLS_H */

7
lib/nssg.h
View File

@ -1,5 +1,5 @@
#ifndef __NSSG_H #ifndef HEADER_CURL_NSSG_H
#define __NSSG_H #define HEADER_CURL_NSSG_H
/*************************************************************************** /***************************************************************************
* _ _ ____ _ * _ _ ____ _
* Project ___| | | | _ \| | * Project ___| | | | _ \| |
@ -28,6 +28,7 @@
*/ */
#include "urldata.h" #include "urldata.h"
CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex); CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex);
CURLcode Curl_nss_connect_nonblocking(struct connectdata *conn, CURLcode Curl_nss_connect_nonblocking(struct connectdata *conn,
int sockindex, int sockindex,
@ -68,4 +69,4 @@ CURLcode Curl_nss_force_init(struct SessionHandle *data);
#define curlssl_data_pending(x,y) (x=x, y=y, 0) #define curlssl_data_pending(x,y) (x=x, y=y, 0)
#endif /* USE_NSS */ #endif /* USE_NSS */
#endif #endif /* HEADER_CURL_NSSG_H */

9
lib/ssluse.h
View File

@ -1,5 +1,5 @@
#ifndef __SSLUSE_H #ifndef HEADER_CURL_SSLUSE_H
#define __SSLUSE_H #define HEADER_CURL_SSLUSE_H
/*************************************************************************** /***************************************************************************
* _ _ ____ _ * _ _ ____ _
* Project ___| | | | _ \| | * Project ___| | | | _ \| |
@ -22,12 +22,15 @@
* *
***************************************************************************/ ***************************************************************************/
#include "setup.h"
#ifdef USE_SSLEAY #ifdef USE_SSLEAY
/* /*
* This header should only be needed to get included by sslgen.c and ssluse.c * This header should only be needed to get included by sslgen.c and ssluse.c
*/ */
#include "urldata.h" #include "urldata.h"
CURLcode Curl_ossl_connect(struct connectdata *conn, int sockindex); CURLcode Curl_ossl_connect(struct connectdata *conn, int sockindex);
CURLcode Curl_ossl_connect_nonblocking(struct connectdata *conn, CURLcode Curl_ossl_connect_nonblocking(struct connectdata *conn,
int sockindex, int sockindex,
@ -81,4 +84,4 @@ bool Curl_ossl_data_pending(const struct connectdata *conn,
#define curlssl_data_pending(x,y) Curl_ossl_data_pending(x,y) #define curlssl_data_pending(x,y) Curl_ossl_data_pending(x,y)
#endif /* USE_SSLEAY */ #endif /* USE_SSLEAY */
#endif /* __SSLUSE_H */ #endif /* HEADER_CURL_SSLUSE_H */