Skip to content

Commit df6d745

Browse files
committed
ext/iconv/config.m4: drop ICONV_BROKEN_IGNORE test
The result of this test was used in PHP's iconv() function to implement a workaround, but the workaround has been removed and there are no remaining consumers of ICONV_BROKEN_IGNORE.
1 parent cf15d7e commit df6d745

File tree

1 file changed

+0
-28
lines changed

1 file changed

+0
-28
lines changed

ext/iconv/config.m4

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -83,34 +83,6 @@ int main(void) {
8383
AS_VAR_IF([php_cv_iconv_errno], [yes],,
8484
[AC_MSG_FAILURE([The iconv check failed, 'errno' is missing.])])
8585

86-
AC_CACHE_CHECK([if iconv supports //IGNORE], [php_cv_iconv_ignore],
87-
[AC_RUN_IFELSE([AC_LANG_SOURCE([
88-
#include <iconv.h>
89-
#include <stdlib.h>
90-
91-
int main(void) {
92-
iconv_t cd = iconv_open( "UTF-8//IGNORE", "UTF-8" );
93-
if(cd == (iconv_t)-1) {
94-
return 1;
95-
}
96-
char *in_p = "\xC3\xC3\xC3\xB8";
97-
size_t in_left = 4, out_left = 4096;
98-
char *out = malloc(out_left);
99-
char *out_p = out;
100-
size_t result = iconv(cd, (char **) &in_p, &in_left, (char **) &out_p, &out_left);
101-
if(result == (size_t)-1) {
102-
return 1;
103-
}
104-
return 0;
105-
}
106-
])],
107-
[php_cv_iconv_ignore=yes],
108-
[php_cv_iconv_ignore=no],
109-
[php_cv_iconv_ignore=no])])
110-
AS_VAR_IF([php_cv_iconv_ignore], [no],
111-
[AC_DEFINE([ICONV_BROKEN_IGNORE], [1],
112-
[Define to 1 if iconv has broken IGNORE.])])
113-
11486
LIBS=$save_LIBS
11587
CFLAGS=$save_CFLAGS
11688

0 commit comments

Comments
 (0)