From: Dan Fandrich <dan@coneharvesters.com>
Date: Fri, 17 Oct 2008 22:23:48 +0000 (+0000)
Subject: Fixed a compile error reported by Albert Chin on AIX and IRIX when using
X-Git-Tag: curl-7_19_1~112
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e55fef5e1ac57597e30d5a490a93d63bc7a363a;p=thirdparty%2Fcurl.git

Fixed a compile error reported by Albert Chin on AIX and IRIX when using
GTLS.
---

diff --git a/CHANGES b/CHANGES
index ff90a0c1f7..af237e1b5a 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 49e39c5634..5f44094556 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 183998cd1f..561cb8cfc0 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