diff options
author | peter <peter@FreeBSD.org> | 2013-11-03 19:04:57 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2013-11-03 19:04:57 +0000 |
commit | 2041181afbfef75d20a432523e8c92bc125acdd5 (patch) | |
tree | c2a94297b5ca505d69af7369b5c160a2d865ca62 /include/iconv.h | |
parent | 49fe0daa4ff16ed937ed34112885e793900dbae2 (diff) | |
download | FreeBSD-src-2041181afbfef75d20a432523e8c92bc125acdd5.zip FreeBSD-src-2041181afbfef75d20a432523e8c92bc125acdd5.tar.gz |
Remove the WITH_LIBICONV_COMPAT hack that seems to do more harm than
good. This caused libc to spoof the ports libiconv namespace and
provide a colliding libiconv.so.3 to fool rtld. This should have
been removed some time ago.
Diffstat (limited to 'include/iconv.h')
-rw-r--r-- | include/iconv.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/include/iconv.h b/include/iconv.h index 69cc2c7..c6b0799 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; |