[PATCH] Removed OLD_ICONV in favor of checking _LIBICONV_VERSION directly
Signed-off-by: Blake Ramsdell <blaker@gmail.com>
---
Makefile | 8 --------
utf8.c | 2 +-
2 files changed, 1 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
index 71479a2..96c8a73 100644
--- a/Makefile
+++ b/Makefile
@@ -95,9 +95,6 @@ all::
#
# Define NO_ICONV if your libc does not properly support iconv.
#
-# Define OLD_ICONV if your library has an old iconv(), where the second
-# (input buffer pointer) parameter is declared with type (const char **).
-#
# Define NO_R_TO_GCC_LINKER if your gcc does not like "-R/path/lib"
# that tells runtime paths to dynamic libraries;
# "-Wl,-rpath=/path/lib" is used instead.
@@ -401,7 +398,6 @@ endif
ifeq ($(uname_S),Darwin)
NEEDS_SSL_WITH_CRYPTO = YesPlease
NEEDS_LIBICONV = YesPlease
- OLD_ICONV = UnfortunatelyYes
NO_STRLCPY = YesPlease
NO_MEMMEM = YesPlease
endif
@@ -657,10 +653,6 @@ ifdef NO_ICONV
BASIC_CFLAGS += -DNO_ICONV
endif
-ifdef OLD_ICONV
- BASIC_CFLAGS += -DOLD_ICONV
-endif
-
ifdef PPC_SHA1
SHA1_HEADER = "ppc/sha1.h"
LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o
diff --git a/utf8.c b/utf8.c
index 4efef6f..a7feb4f 100644
--- a/utf8.c
+++ b/utf8.c
@@ -300,7 +300,7 @@ int is_encoding_utf8(const char *name)
* with iconv. If the conversion fails, returns NULL.
*/
#ifndef NO_ICONV
-#ifdef OLD_ICONV
+#if _LIBICONV_VERSION <= 0x0109
typedef const char * iconv_ibp;
#else
typedef char * iconv_ibp;
--
1.5.3.GIT
Blake Ramsdell <blaker@gmail.com>