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

GTLS.

diff --git a/CHANGES b/CHANGES
index ff90a0c1f7ae2d87738fded9011b2a48008dff68..af237e1b5a69b828b6499ffded6cb4f75a1ebb3b 100644 (file)
--- 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 49e39c56341af8ff43314411b54064b9b1d28b8f..5f44094556bc3eaf553880120d80b6f8385a8abe 100644 (file)
--- 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 183998cd1f07e10968dc23542f7399623c493f54..561cb8cfc05691459494fd2c4d6b34fc6a94f104 100644 (file)
--- 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