summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2013-07-03 07:03:19 +0000
committerpeter <peter@FreeBSD.org>2013-07-03 07:03:19 +0000
commita02844e93b39b1329fb99d013834aa360f9f22ca (patch)
treeaa3112ae9aed3dd307cbc6910a43d4af316b5143 /include
parent768522d3251b4165790523bf0382af436e1d5d21 (diff)
downloadFreeBSD-src-a02844e93b39b1329fb99d013834aa360f9f22ca.zip
FreeBSD-src-a02844e93b39b1329fb99d013834aa360f9f22ca.tar.gz
Replace the #define for "iconv" so it is for the function name instead of
a macro with parameters. Remove a __DECONST hack and add consts instead for gnu libiconv API compatability. This makes it work with things like devel/boost-libs that expects to use "iconv" as though it were a pointer.
Diffstat (limited to 'include')
-rw-r--r--include/iconv.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/iconv.h b/include/iconv.h
index eecb2fd..7b628af 100644
--- a/include/iconv.h
+++ b/include/iconv.h
@@ -43,7 +43,7 @@
#define iconv_open libiconv_open
#define iconv_close libiconv_close
-#define iconv(cd, in, insize, out, outsize) libiconv(cd, __DECONST(char **, in), insize, out, outsize)
+#define iconv libiconv
#define iconv_t libiconv_t
struct __tag_iconv_t;
@@ -51,7 +51,7 @@ typedef struct __tag_iconv_t *iconv_t;
__BEGIN_DECLS
iconv_t libiconv_open(const char *, const char *);
-size_t libiconv(iconv_t, char ** __restrict,
+size_t libiconv(iconv_t, const char ** __restrict,
size_t * __restrict, char ** __restrict,
size_t * __restrict);
int libiconv_close(iconv_t);
@@ -60,7 +60,7 @@ int libiconv_close(iconv_t);
*/
int __iconv_get_list(char ***, size_t *, bool);
void __iconv_free_list(char **, size_t);
-size_t __iconv(iconv_t, char **, size_t *, char **,
+size_t __iconv(iconv_t, const char **, size_t *, char **,
size_t *, __uint32_t, size_t *);
#define __ICONV_F_HIDE_INVALID 0x0001
OpenPOWER on IntegriCloud