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_proxy.c | |
parent | eb65a49befa040746b222e693bba19ee56814e85 (diff) | |
download | curl-c828646f60b5bffb2bfcf924eba36da767bf08bf.tar.gz |
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_proxy.c')
-rw-r--r-- | lib/http_proxy.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/http_proxy.c b/lib/http_proxy.c index 7631ae53c..99f3f0a70 100644 --- a/lib/http_proxy.c +++ b/lib/http_proxy.c @@ -33,6 +33,7 @@ #include "select.h" #include "rawstr.h" #include "progress.h" +#include "non-ascii.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> @@ -315,14 +316,12 @@ CURLcode Curl_proxyCONNECT(struct connectdata *conn, char letter; int writetype; -#ifdef CURL_DOES_CONVERSIONS /* convert from the network encoding */ result = Curl_convert_from_network(data, line_start, perline); /* Curl_convert_from_network calls failf if unsuccessful */ if(result) return result; -#endif /* CURL_DOES_CONVERSIONS */ /* output debug if that is requested */ if(data->set.verbose) |