diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2011-04-20 00:48:20 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2011-04-20 00:50:07 +0200 |
| commit | c828646f60b5bffb2bfcf924eba36da767bf08bf (patch) | |
| tree | a13db5750b3927a2dea67364fbafba4b91fa7e9f /lib/http_digest.c | |
| parent | eb65a49befa040746b222e693bba19ee56814e85 (diff) | |
CURL_DOES_CONVERSIONS: cleanup
Massively reduce #ifdefs all over (23 #ifdef lines less so far)
Moved conversion-specific code to non-ascii.c
Diffstat (limited to 'lib/http_digest.c')
| -rw-r--r-- | lib/http_digest.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/http_digest.c b/lib/http_digest.c index 45d8aeba8..4993a987d 100644 --- a/lib/http_digest.c +++ b/lib/http_digest.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -38,7 +38,7 @@ #include "strtok.h" #include "url.h" /* for Curl_safefree() */ #include "curl_memory.h" -#include "easyif.h" /* included for Curl_convert_... prototypes */ +#include "non-ascii.h" /* included for Curl_convert_... prototypes */ #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> @@ -294,7 +294,6 @@ CURLcode Curl_output_digest(struct connectdata *conn, struct SessionHandle *data = conn->data; struct digestdata *d; -#ifdef CURL_DOES_CONVERSIONS CURLcode rc; /* The CURL_OUTPUT_DIGEST_CONV macro below is for non-ASCII machines. It converts digest text to ASCII so the MD5 will be correct for @@ -306,9 +305,6 @@ CURLcode Curl_output_digest(struct connectdata *conn, free(b); \ return rc; \ } -#else -#define CURL_OUTPUT_DIGEST_CONV(a, b) -#endif /* CURL_DOES_CONVERSIONS */ if(proxy) { d = &data->state.proxydigest; |