aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Fandrich <dan@coneharvesters.com>2008-10-17 22:23:48 +0000
committerDan Fandrich <dan@coneharvesters.com>2008-10-17 22:23:48 +0000
commit3e55fef5e1ac57597e30d5a490a93d63bc7a363a (patch)
treea4ed135c1135ad2cb60837e72194ee91453d7098
parent63397e380f6491c3dc304079b8aa9465d2f268c1 (diff)
Fixed a compile error reported by Albert Chin on AIX and IRIX when using
GTLS.
-rw-r--r--CHANGES4
-rw-r--r--lib/gtls.h2
-rw-r--r--lib/nssg.h2
3 files changed, 6 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index ff90a0c1f..af237e1b5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@
Changelog
+Daniel Fandrich (17 Oct 2008)
+- Fixed a compile error reported by Albert Chin on AIX and IRIX when using
+ GTLS.
+
Daniel Stenberg (16 Oct 2008)
- Igor Novoseltsev added CURLOPT_PROXYUSER and CURLOPT_PROXYPASSWORD that then
make CURLOPT_PROXYUSERPWD sort of deprecated. The primary motive for adding
diff --git a/lib/gtls.h b/lib/gtls.h
index 49e39c563..5f4409455 100644
--- a/lib/gtls.h
+++ b/lib/gtls.h
@@ -58,7 +58,7 @@ int Curl_gtls_shutdown(struct connectdata *conn, int sockindex);
#define curlssl_shutdown(x,y) Curl_gtls_shutdown(x,y)
#define curlssl_set_engine(x,y) (x=x, y=y, CURLE_FAILED_INIT)
#define curlssl_set_engine_default(x) (x=x, CURLE_FAILED_INIT)
-#define curlssl_engines_list(x) (x=x, NULL)
+#define curlssl_engines_list(x) (x=x, (curl_slist *)NULL)
#define curlssl_send Curl_gtls_send
#define curlssl_recv Curl_gtls_recv
#define curlssl_version Curl_gtls_version
diff --git a/lib/nssg.h b/lib/nssg.h
index 183998cd1..561cb8cfc 100644
--- a/lib/nssg.h
+++ b/lib/nssg.h
@@ -70,7 +70,7 @@ int Curl_nss_seed(struct SessionHandle *data);
#define curlssl_shutdown(x,y) (x=x, y=y, 1)
#define curlssl_set_engine(x,y) (x=x, y=y, CURLE_FAILED_INIT)
#define curlssl_set_engine_default(x) (x=x, CURLE_FAILED_INIT)
-#define curlssl_engines_list(x) (x=x, NULL)
+#define curlssl_engines_list(x) (x=x, (curl_slist *)NULL)
#define curlssl_send Curl_nss_send
#define curlssl_recv Curl_nss_recv
#define curlssl_version Curl_nss_version