Index: iconv.c
===================================================================
RCS file: /home/cvspublic/apr-iconv/lib/iconv.c,v
retrieving revision 1.6
diff -u -r1.6 iconv.c
--- iconv.c	26 Jul 2001 23:12:59 -0000	1.6
+++ iconv.c	8 Jan 2003 08:52:48 -0000
@@ -117,32 +117,43 @@
 
 #else
 
+#include "apr.h"
+#include "apr_pools.h"
+#include "apr_iconv.h"
+#include <stddef.h>
 #include <iconv.h>
+#ifdef WIN32
+#pragma comment(lib, "iconv")
+#endif
 
-apr_status_t apr_iconv_open(const char *to_charset,
-            const char *from_charset, apr_pool_t *ctx, iconv_t **res)
+API_DECLARE(apr_status_t)
+apr_iconv_open(const char *to_charset,
+            const char *from_charset, apr_pool_t *ctx, iconv_t *res)
 {
-	*res = iconv_open(to_charset, from_charset);
-	if (*res == (apr_size_t) -1)
-		return apr_get_os_error();
-	return APR_SUCCESS;
+    *res = iconv_open(to_charset, from_charset);
+    if (*res == (iconv_t)(-1))
+        return apr_get_os_error();
+    return APR_SUCCESS;
 }
 
-apr_status_t apr_iconv(iconv_t cd, const char **inbuf,
+API_DECLARE(apr_status_t)
+apr_iconv(iconv_t cd, const char **inbuf,
             apr_size_t *inbytesleft, char **outbuf,
             apr_size_t *outbytesleft, apr_size_t *result)
 {
-	*result = iconv(cd , inbuf, inbytesleft, outbuf, outbytesleft);
-	if (*result == (apr_size_t) -1)
-		return apr_get_os_error();
-	return APR_SUCCESS;
+
+    *result = iconv(cd , inbuf, inbytesleft, outbuf, outbytesleft);
+    if (*result == (apr_size_t) -1)
+        return apr_get_os_error();
+    return APR_SUCCESS;
 }
-apr_status_t apr_iconv_close(iconv_t cd)
+
+API_DECLARE(apr_status_t)
+apr_iconv_close(iconv_t cd, apr_pool_t *ctx)
 {
-	int status;
-	if (iconv_close(cd))
-		return apr_get_os_error();
-	return APR_SUCCESS;
+    if (iconv_close(cd))
+        return apr_get_os_error();
+    return APR_SUCCESS;
 }
 
 #endif /* !defined(HAVE_ICONV) */