diff options
| author | sjg <sjg@FreeBSD.org> | 2013-09-11 18:16:18 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2013-09-11 18:16:18 +0000 |
| commit | ff87b5d1477fd150ff715e5c3c2a205deb66804f (patch) | |
| tree | a3620d99f472deaa7f019c4324bb8f4e38ac4272 /include | |
| parent | 62bb1062226d3ce6a2350808256a25508978352d (diff) | |
| parent | 4d92de31b23f33109e1fa7f0b1499ed6c3501ee1 (diff) | |
| download | FreeBSD-src-ff87b5d1477fd150ff715e5c3c2a205deb66804f.zip FreeBSD-src-ff87b5d1477fd150ff715e5c3c2a205deb66804f.tar.gz | |
Merge head
Diffstat (limited to 'include')
| -rw-r--r-- | include/iconv.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/iconv.h b/include/iconv.h index 3423a24..69cc2c7 100644 --- a/include/iconv.h +++ b/include/iconv.h @@ -35,7 +35,6 @@ #include <sys/cdefs.h> #include <sys/types.h> -#include <stdbool.h> #include <wchar.h> #include <sys/cdefs.h> @@ -48,6 +47,13 @@ #define libiconv iconv #define libiconv_t iconv_t #endif +#ifdef __cplusplus +typedef bool __iconv_bool; +#elif __STDC_VERSION__ >= 199901L +typedef _Bool __iconv_bool; +#else +typedef int __iconv_bool; +#endif struct __tag_iconv_t; typedef struct __tag_iconv_t *iconv_t; @@ -61,7 +67,7 @@ int iconv_close(iconv_t); /* * non-portable interfaces for iconv */ -int __iconv_get_list(char ***, size_t *, bool); +int __iconv_get_list(char ***, size_t *, __iconv_bool); void __iconv_free_list(char **, size_t); size_t __iconv(iconv_t, const char **, size_t *, char **, size_t *, __uint32_t, size_t *); |
