path: root/include
diff options
authorgjb <>2013-11-16 18:40:44 +0000
committergjb <>2013-11-16 18:40:44 +0000
commit8eaba2804804dd2ab64fe5068337bbbbc922b838 (patch)
tree080da886a4c319c2fb111aa2e78ddaca2ca8df88 /include
parentd64a9255590b1462b95f79aade2cd6193a7f06f7 (diff)
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 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 'include')
2 files changed, 1 insertions, 28 deletions
diff --git a/include/Makefile b/include/Makefile
index 1f55f4e..44a54e3 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
- echo "#undef __LIBICONV_COMPAT" >> _libiconv_compat.h
+INCS+= iconv.h
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>
-#define libiconv_open iconv_open
-#define libiconv_close iconv_close
-#define libiconv iconv
-#define libiconv_t iconv_t
#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
-#define libiconv_open_into iconv_open_into
-#define libiconvctl iconvctl
-#define libiconvlist iconvlist
-#define libiconv_set_relocation_prefix iconv_set_relocation_prefix
/* We have iconvctl() */
#define _ICONV_VERSION 0x0108
extern int _iconv_version;
-#define _libiconv_version _iconv_version
typedef struct {
void *spaceholder[64];
} iconv_allocation_t;
OpenPOWER on IntegriCloud