Commit 78199b60 authored by Yang Tse's avatar Yang Tse
Browse files

NTLM: header inclusion cleanup follow-up

parent 05ef2451

lib/gtls.h

+7 −3
Original line number Diff line number Diff line 
#ifndef __GTLS_H

#define __GTLS_H

#ifndef HEADER_CURL_GTLS_H

#define HEADER_CURL_GTLS_H

/***************************************************************************

 *                                  _   _ ____  _

 *  Project                     ___| | | |  _ \| |
@@ -22,8 +22,12 @@ 
 *

 ***************************************************************************/



#include "setup.h"



#ifdef USE_GNUTLS



#include "urldata.h"



int Curl_gtls_init(void);

int Curl_gtls_cleanup(void);

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)



#endif /* USE_GNUTLS */

#endif
 
#endif /* HEADER_CURL_GTLS_H */

lib/nssg.h

+4 −3
Original line number Diff line number Diff line 
#ifndef __NSSG_H

#define __NSSG_H

#ifndef HEADER_CURL_NSSG_H

#define HEADER_CURL_NSSG_H

/***************************************************************************

 *                                  _   _ ____  _

 *  Project                     ___| | | |  _ \| |
@@ -28,6 +28,7 @@ 
 */



#include "urldata.h"



CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex);

CURLcode Curl_nss_connect_nonblocking(struct connectdata *conn,

                                      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)



#endif /* USE_NSS */

#endif
 
#endif /* HEADER_CURL_NSSG_H */

lib/ssluse.h

+6 −3
Original line number Diff line number Diff line 
#ifndef __SSLUSE_H

#define __SSLUSE_H

#ifndef HEADER_CURL_SSLUSE_H

#define HEADER_CURL_SSLUSE_H

/***************************************************************************

 *                                  _   _ ____  _

 *  Project                     ___| | | |  _ \| |
@@ -22,12 +22,15 @@ 
 *

 ***************************************************************************/



#include "setup.h"



#ifdef USE_SSLEAY

/*

 * This header should only be needed to get included by sslgen.c and ssluse.c

 */



#include "urldata.h"



CURLcode Curl_ossl_connect(struct connectdata *conn, int sockindex);

CURLcode Curl_ossl_connect_nonblocking(struct connectdata *conn,

                                       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)



#endif /* USE_SSLEAY */

#endif /* __SSLUSE_H */
 
#endif /* HEADER_CURL_SSLUSE_H */