diff options
| author | theraven <theraven@FreeBSD.org> | 2013-09-06 09:46:44 +0000 |
|---|---|---|
| committer | theraven <theraven@FreeBSD.org> | 2013-09-06 09:46:44 +0000 |
| commit | c04dfb0b1932e7a84103ade5ccddab95eb4d5a28 (patch) | |
| tree | f507ed7cb6b08b5b63fc242bc2de8c7e231b28ea /lib | |
| parent | 178dd060a80512b07630eb7f22500ed9871ca84c (diff) | |
| download | FreeBSD-src-c04dfb0b1932e7a84103ade5ccddab95eb4d5a28.zip FreeBSD-src-c04dfb0b1932e7a84103ade5ccddab95eb4d5a28.tar.gz | |
Fix the namespace pollution caused by iconv.h including stdbool.h
This broke any C89 ports that defined bool themselves, including things
like gcc, gtk, and so on.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc/iconv/citrus_iconv_local.h | 1 | ||||
| -rw-r--r-- | lib/libiconv_modules/Makefile | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/libc/iconv/citrus_iconv_local.h b/lib/libc/iconv/citrus_iconv_local.h index 52ac825..e673c9a 100644 --- a/lib/libc/iconv/citrus_iconv_local.h +++ b/lib/libc/iconv/citrus_iconv_local.h @@ -31,6 +31,7 @@ #define _CITRUS_ICONV_LOCAL_H_ #include <iconv.h> +#include <stdbool.h> #define _CITRUS_ICONV_GETOPS_FUNC_BASE(_n_) \ int _n_(struct _citrus_iconv_ops *) diff --git a/lib/libiconv_modules/Makefile b/lib/libiconv_modules/Makefile index 1a72136..2bb09da 100644 --- a/lib/libiconv_modules/Makefile +++ b/lib/libiconv_modules/Makefile @@ -2,6 +2,9 @@ .include <bsd.own.mk> +CFLAGS+= -Dbool=_Bool +.export CFLAGS + SUBDIR= BIG5 DECHanyu EUC EUCTW GBK2K HZ ISO2022 JOHAB MSKanji UES UTF1632 \ UTF7 UTF8 VIQR ZW iconv_none iconv_std mapper_646 mapper_none \ mapper_parallel mapper_serial mapper_std mapper_zone |
