From: Gisle Vanem <gvanem@broadpark.no>
Date: Wed, 20 Apr 2011 13:23:57 +0000 (+0200)
Subject: CURL_DOES_CONVERSIONS: fixes
X-Git-Tag: curl-7_21_6~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9039d19f01f2d201dd4dfeac5a81753c82c72147;p=thirdparty%2Fcurl.git

CURL_DOES_CONVERSIONS: fixes

Made it compile and work again after the code move.
---

diff --git a/lib/non-ascii.c b/lib/non-ascii.c
index 945178e53e..7e6ad37bf4 100644
--- a/lib/non-ascii.c
+++ b/lib/non-ascii.c
@@ -24,6 +24,13 @@
 
 #ifdef CURL_DOES_CONVERSIONS
 
+#include "non-ascii.h"
+#include "formdata.h"
+#include "sendf.h"
+#include "urldata.h"
+
+#include <curl/curl.h>
+
 #ifdef HAVE_ICONV
 #include <iconv.h>
 /* set default codesets for iconv */
@@ -37,10 +44,10 @@
 #endif /* HAVE_ICONV */
 
 /*
- * Curl_convertclone() returns a malloced copy of the source string (if
+ * Curl_convert_clone() returns a malloced copy of the source string (if
  * returning CURLE_OK), with the data converted to network format.
  */
-CURLcode Curl_convertclone(struct SessionHandle *data,
+CURLcode Curl_convert_clone(struct SessionHandle *data,
                            const char *indata,
                            size_t insize,
                            char **outbuf)
@@ -54,7 +61,7 @@ CURLcode Curl_convertclone(struct SessionHandle *data,
 
   memcpy(convbuf, indata, insize);
   result = Curl_convert_to_network(data, convbuf, insize);
-  if(result) {s
+  if(result) {
     free(convbuf);
     return result;
   }
diff --git a/lib/non-ascii.h b/lib/non-ascii.h
index cccb11f255..89899bedd1 100644
--- a/lib/non-ascii.h
+++ b/lib/non-ascii.h
@@ -26,7 +26,7 @@
 #include "urldata.h"
 
 /*
- * Curl_convertclone() returns a malloced copy of the source string (if
+ * Curl_convert_clone() returns a malloced copy of the source string (if
  * returning CURLE_OK), with the data converted to network format.
  *
  * If no conversion was needed *outbuf may be NULL.
diff --git a/lib/transfer.c b/lib/transfer.c
index 08d5ed37f0..1684a489f4 100644
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -103,6 +103,7 @@
 #include "multiif.h"
 #include "rtsp.h"
 #include "connect.h"
+#include "non-ascii.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>