Skip to content

Commit 786b2ca

Browse files
committed
build: iconv does not have const input parameter.
glibc was changed[1]. [1] http://sourceware.org/git/?p=glibc.git;a=commit;f=iconv/iconv.h;h=0efb48a1dfd132138a44c238b6e7f67a185a360e
1 parent ab6cd1d commit 786b2ca

File tree

2 files changed

+1
-32
lines changed

2 files changed

+1
-32
lines changed

configure.ac

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -95,34 +95,6 @@ AC_ARG_VAR([ICONV_LIBS], [linker flags for iconv])
9595
CPPFLAGS="${CPPFLAGS} ${ICONV_CFLAGS}"
9696
LIBS="${LIBS} ${ICONV_LIBS}"
9797

98-
AC_MSG_CHECKING([iconv can handle const])
99-
OLD_CPPFLAGS="${CPPFLAGS}"
100-
test "${GCC}" = "yes" && CPPFLAGS="${CPPFLAGS} -Werror"
101-
AC_COMPILE_IFELSE(
102-
[AC_LANG_PROGRAM(
103-
[[
104-
#include <iconv.h>
105-
#include <stdlib.h>
106-
]],
107-
[[
108-
const char *test1 = NULL;
109-
iconv (
110-
(iconv_t)0,
111-
&test1,
112-
NULL,
113-
NULL,
114-
NULL
115-
);
116-
]]
117-
)],
118-
[AC_MSG_RESULT([yes])],
119-
[
120-
AC_MSG_RESULT([no])
121-
AC_DEFINE([HAVE_OLD_ICONV], [1], [Iconv does not support const])
122-
]
123-
)
124-
CPPFLAGS="${OLD_CPPFLAGS}"
125-
12698
if test "${enable_pedantic}" = "yes"; then
12799
enable_strict="yes";
128100
CXXFLAGS="${CXXFLAGS} -pedantic"

mp3unicode.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,10 +229,7 @@ class Converter {
229229
if (
230230
iconv (
231231
cd,
232-
#ifdef HAVE_OLD_ICONV
233-
(char **)
234-
#endif
235-
&from,
232+
(char **)&from,
236233
&from_size,
237234
&to,
238235
&to_size

0 commit comments

Comments
 (0)