diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2012-05-22 22:49:40 +0900 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2012-05-22 16:40:09 +0200 |
| commit | 6cc066a2c57e39306e7be538826fd4e17a8fa102 (patch) | |
| tree | 6a0d115b129d70dad7d959635ffb1abe81917ed2 /lib/curl_md5.h | |
| parent | 0fd7fa7daf39e902e9f09d1133e01658e75312cc (diff) | |
| download | curl-6cc066a2c57e39306e7be538826fd4e17a8fa102.tar.gz | |
Fixed compile error with GNUTLS+NETTLE
In nettle/md5.h, md5_init and md5_update are defined as macros to
nettle_md5_init and nettle_md5_update respectively. This causes
error when using MD5_params.md5_init and md5_update. This patch
renames these members as md5_init_func and md5_update_func to
avoid name conflict. For completeness, MD5_params.md5_final was
also renamed as md5_final_func.
The changes in curl_ntlm_core.c is conversion error and fixed by
casting to proper type.
Diffstat (limited to 'lib/curl_md5.h')
| -rw-r--r-- | lib/curl_md5.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/curl_md5.h b/lib/curl_md5.h index b445500fc..9c0e0b5ee 100644 --- a/lib/curl_md5.h +++ b/lib/curl_md5.h @@ -34,9 +34,9 @@ typedef void (* Curl_MD5_update_func)(void *context, typedef void (* Curl_MD5_final_func)(unsigned char *result, void *context); typedef struct { - Curl_MD5_init_func md5_init; /* Initialize context procedure */ - Curl_MD5_update_func md5_update; /* Update context with data */ - Curl_MD5_final_func md5_final; /* Get final result procedure */ + Curl_MD5_init_func md5_init_func; /* Initialize context procedure */ + Curl_MD5_update_func md5_update_func; /* Update context with data */ + Curl_MD5_final_func md5_final_func; /* Get final result procedure */ unsigned int md5_ctxtsize; /* Context structure size */ unsigned int md5_resultlen; /* Result length (bytes) */ } MD5_params; |