diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2013-09-11 18:16:18 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2013-09-11 18:16:18 +0000 |
| commit | d466a5b069a40c37cec11dfd03fd46b30c4c9587 (patch) | |
| tree | a3620d99f472deaa7f019c4324bb8f4e38ac4272 /include | |
| parent | d1d015864103b253b3fcb2f72a0da5b0cfeb31b6 (diff) | |
| parent | 64c5de5483d0895b673ba6506d204762b8b11a60 (diff) | |
| download | src-d466a5b069a40c37cec11dfd03fd46b30c4c9587.tar.gz src-d466a5b069a40c37cec11dfd03fd46b30c4c9587.zip | |
Merge head
Notes
Notes:
svn path=/projects/bmake/; revision=255477
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 3423a24d063b..69cc2c7d16a6 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 *); |