oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

actually, scratch the last change

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@1524 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes 2004-06-17 15:36:37 +00:00
parent 4ab66ad1b7
commit e1a94f917d
3 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
configure.ac
View File

@ -157,26 +157,6 @@ if test x$enable_iconv = xyes; then
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_CHECK_LIB(iconv,main,MPD_LIBS="$MPD_LIBS $ICONV_LIBS",)
AC_DEFINE(HAVE_ICONV,1,[Define to use iconv]) 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 fi
CFLAGS=$oldcflags CFLAGS=$oldcflags
LIBS=$oldlibs LIBS=$oldlibs

2
src/charConv.c
View File

@ -83,7 +83,7 @@ int setCharSetConversion(char * to, char * from) {
return -1; return -1;
} }
char * convStrDup(ICONV_CONST char * string) { char * convStrDup(char * string) {
if(!char_conv_to) return NULL; if(!char_conv_to) return NULL;
if(char_conv_same) return strdup(string); if(char_conv_same) return strdup(string);

2
src/charConv.h
View File

@ -23,7 +23,7 @@
int setCharSetConversion(char * to, char * from); int setCharSetConversion(char * to, char * from);
char * convStrDup(ICONV_CONST char * string); char * convStrDup(char * string);
void closeCharSetConversion(); void closeCharSetConversion();