diff options
| author | gjb <gjb@FreeBSD.org> | 2013-11-16 18:40:44 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2013-11-16 18:40:44 +0000 |
| commit | 8eaba2804804dd2ab64fe5068337bbbbc922b838 (patch) | |
| tree | 080da886a4c319c2fb111aa2e78ddaca2ca8df88 /lib/libc/iconv/iconv.c | |
| parent | d64a9255590b1462b95f79aade2cd6193a7f06f7 (diff) | |
| download | FreeBSD-src-8eaba2804804dd2ab64fe5068337bbbbc922b838.zip FreeBSD-src-8eaba2804804dd2ab64fe5068337bbbbc922b838.tar.gz | |
MFC r257583, r258012, r258013:
r257583 (peter):
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.
r258012:
Remove WITH_LIBICONV_COMPAT file to chase after r257583.
r258013:
Regenerate src.conf.5 after removal of WITH_LIBICONV_COMPAT.
Approved by: re (kib)
Sponsored by: The FreeBSD Foundation
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'lib/libc/iconv/iconv.c')
| -rw-r--r-- | lib/libc/iconv/iconv.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/lib/libc/iconv/iconv.c b/lib/libc/iconv/iconv.c index f388e8b..a4faf72 100644 --- a/lib/libc/iconv/iconv.c +++ b/lib/libc/iconv/iconv.c @@ -47,18 +47,6 @@ #include "citrus_hash.h" #include "citrus_iconv.h" -#include <_libiconv_compat.h> -#ifdef __LIBICONV_COMPAT -__weak_reference(iconv, libiconv); -__weak_reference(iconv_open, libiconv_open); -__weak_reference(iconv_open_into, libiconv_open_into); -__weak_reference(iconv_close, libiconv_close); -__weak_reference(iconvlist, libiconvlist); -__weak_reference(iconvctl, libiconvctl); -__weak_reference(iconv_set_relocation_prefix, libiconv_set_relocation_prefix); -__weak_reference(_iconv_version, _libiconv_version); -#endif - #define ISBADF(_h_) (!(_h_) || (_h_) == (iconv_t)-1) int _iconv_version = _ICONV_VERSION; |
