aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2011-08-28 11:29:09 +0200
committerYang Tse <yangsita@gmail.com>2011-08-28 11:29:09 +0200
commit78199b6030e07112d1515272afd7017337fa79c7 (patch)
tree92f16220e245ea868d8962593aceb1c1469e5183
parent05ef245170fd71f2907b89e2d1361b2e70113199 (diff)
NTLM: header inclusion cleanup follow-up
-rw-r--r--lib/gtls.h10
-rw-r--r--lib/nssg.h7
-rw-r--r--lib/ssluse.h9
3 files changed, 17 insertions, 9 deletions
diff --git a/lib/gtls.h b/lib/gtls.h
index 6275b49a3..733122e6c 100644
--- a/lib/gtls.h
+++ b/lib/gtls.h
@@ -1,5 +1,5 @@
-#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 */
diff --git a/lib/nssg.h b/lib/nssg.h
index 438d5a636..5f557c8d7 100644
--- a/lib/nssg.h
+++ b/lib/nssg.h
@@ -1,5 +1,5 @@
-#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 */
diff --git a/lib/ssluse.h b/lib/ssluse.h
index 2ac0ad2ec..732ec7c72 100644
--- a/lib/ssluse.h
+++ b/lib/ssluse.h
@@ -1,5 +1,5 @@
-#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 */