diff options
author | Peter Wemm <peter@FreeBSD.org> | 2013-11-03 19:04:57 +0000 |
---|---|---|
committer | Peter Wemm <peter@FreeBSD.org> | 2013-11-03 19:04:57 +0000 |
commit | 912ce912e19e00d0f96f724d0dccf3332cd4a867 (patch) | |
tree | c2a94297b5ca505d69af7369b5c160a2d865ca62 /include | |
parent | cb491a4d63afef90b06a8a45605eff2c3ae22e90 (diff) | |
download | src-912ce912e19e00d0f96f724d0dccf3332cd4a867.tar.gz src-912ce912e19e00d0f96f724d0dccf3332cd4a867.zip |
Notes
Diffstat (limited to 'include')
-rw-r--r-- | include/Makefile | 10 | ||||
-rw-r--r-- | include/iconv.h | 19 |
2 files changed, 1 insertions, 28 deletions
diff --git a/include/Makefile b/include/Makefile index 61435ccd40d0..703245094c3b 100644 --- a/include/Makefile +++ b/include/Makefile @@ -83,15 +83,7 @@ _netipx= netipx # Handle the #define aliases for libiconv .if ${MK_ICONV} == "yes" -CLEANFILES+= _libiconv_compat.h -INCS+= _libiconv_compat.h iconv.h -_libiconv_compat.h: ${.CURDIR}/Makefile - echo "/* Indicate whether libiconv symbols are present */" > _libiconv_compat.h -.if ${MK_LIBICONV_COMPAT} == "yes" - echo "#define __LIBICONV_COMPAT" >> _libiconv_compat.h -.else - echo "#undef __LIBICONV_COMPAT" >> _libiconv_compat.h -.endif +INCS+= iconv.h .endif diff --git a/include/iconv.h b/include/iconv.h index 69cc2c7d16a6..c6b0799725cb 100644 --- a/include/iconv.h +++ b/include/iconv.h @@ -40,13 +40,6 @@ #include <sys/cdefs.h> #include <sys/types.h> -#include <_libiconv_compat.h> -#ifdef __LIBICONV_COMPAT -#define libiconv_open iconv_open -#define libiconv_close iconv_close -#define libiconv iconv -#define libiconv_t iconv_t -#endif #ifdef __cplusplus typedef bool __iconv_bool; #elif __STDC_VERSION__ >= 199901L @@ -76,22 +69,10 @@ size_t __iconv(iconv_t, const char **, size_t *, char **, /* * GNU interfaces for iconv */ -#ifdef __LIBICONV_COMPAT -#define libiconv_open_into iconv_open_into -#define libiconvctl iconvctl -#define libiconvlist iconvlist -#define libiconv_set_relocation_prefix iconv_set_relocation_prefix -#endif - /* We have iconvctl() */ #define _ICONV_VERSION 0x0108 extern int _iconv_version; -#ifdef __LIBICONV_COMPAT -#define _libiconv_version _iconv_version -#define _LIBICONV_VERSION _ICONV_VERSION -#endif - typedef struct { void *spaceholder[64]; } iconv_allocation_t; |