From e1a94f917df4da9073cf52d8dcdb26bc12b76930 Mon Sep 17 00:00:00 2001
From: Warren Dukes <warren.dukes@gmail.com>
Date: Thu, 17 Jun 2004 15:36:37 +0000
Subject: actually, scratch the last change

git-svn-id: https://svn.musicpd.org/mpd/trunk@1524 09075e82-0dd4-0310-85a5-a0d7c8717e4f
---
 configure.ac   | 20 --------------------
 src/charConv.c |  2 +-
 src/charConv.h |  2 +-
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/configure.ac b/configure.ac
index f1c867ebe..9137a074b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -157,26 +157,6 @@ if test x$enable_iconv = xyes; then
 	if test x$enable_iconv = xyes; then
 		AC_CHECK_LIB(iconv,main,MPD_LIBS="$MPD_LIBS $ICONV_LIBS",)
 		AC_DEFINE(HAVE_ICONV,1,[Define to use iconv])
-		AC_MSG_CHECKING([for iconv declaration])
-		AC_CACHE_VAL(proto_iconv, [
-			AC_TRY_COMPILE([
-#include <stdlib.h>
-#include <iconv.h>
-extern
-#ifdef __cplusplus
-"C"
-#endif
-#if defined(__STDC__) || defined(__cplusplus)
-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
-#else
-size_t iconv();
-#endif
-], [], iconv_arg1="", iconv_arg1="const")
-		        proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
-			proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-			AC_MSG_RESULT([$]{ac_t:-}[$]proto_iconv)
-			AC_DEFINE_UNQUOTED(ICONV_CONST, $proto_iconv_arg1,
-				[Define as const if the declaration of iconv() needs const.])
 	fi
 	CFLAGS=$oldcflags
 	LIBS=$oldlibs
diff --git a/src/charConv.c b/src/charConv.c
index 52c14987b..354a8aba7 100644
--- a/src/charConv.c
+++ b/src/charConv.c
@@ -83,7 +83,7 @@ int setCharSetConversion(char * to, char * from) {
 	return -1;
 }
 
-char * convStrDup(ICONV_CONST char * string) {
+char * convStrDup(char * string) {
 	if(!char_conv_to) return NULL;
 
 	if(char_conv_same) return strdup(string);
diff --git a/src/charConv.h b/src/charConv.h
index 3093fcac2..5687c1e7e 100644
--- a/src/charConv.h
+++ b/src/charConv.h
@@ -23,7 +23,7 @@
 
 int setCharSetConversion(char * to, char * from);
 
-char * convStrDup(ICONV_CONST char * string);
+char * convStrDup(char * string);
 
 void closeCharSetConversion();
 
-- 
cgit v1.2.3