Skip to content

Commit 7bd1d70

Browse files
committed
Remove PHP_ICONV_H_PATH
Directly include <iconv.h> instead, now that the giconv.h distinction no longer exists.
1 parent 2d35974 commit 7bd1d70

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

ext/iconv/config.m4

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ if test "$PHP_ICONV" != "no"; then
2929

3030
CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS"
3131
LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS"
32-
PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/iconv.h"
3332

3433
AC_MSG_CHECKING([if iconv is glibc's])
3534
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <gnu/libc-version.h>]], [[gnu_get_libc_version();]])],[
@@ -44,7 +43,7 @@ if test "$PHP_ICONV" != "no"; then
4443
php_iconv_old_ld="$LDFLAGS"
4544
LDFLAGS="-liconv $LDFLAGS"
4645
AC_RUN_IFELSE([AC_LANG_SOURCE([[
47-
#include <$PHP_ICONV_H_PATH>
46+
#include <iconv.h>
4847
int main() {
4948
printf("%d", _libiconv_version);
5049
return 0;
@@ -108,7 +107,7 @@ int main() {
108107

109108
AC_MSG_CHECKING([if iconv supports errno])
110109
AC_RUN_IFELSE([AC_LANG_SOURCE([[
111-
#include <$PHP_ICONV_H_PATH>
110+
#include <iconv.h>
112111
#include <errno.h>
113112
114113
int main() {
@@ -135,7 +134,7 @@ int main() {
135134

136135
AC_MSG_CHECKING([if iconv supports //IGNORE])
137136
AC_RUN_IFELSE([AC_LANG_SOURCE([[
138-
#include <$PHP_ICONV_H_PATH>
137+
#include <iconv.h>
139138
#include <stdlib.h>
140139
141140
int main() {
@@ -166,11 +165,10 @@ int main() {
166165

167166
AC_MSG_CHECKING([if your cpp allows macro usage in include lines])
168167
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
169-
#define FOO <$PHP_ICONV_H_PATH>
168+
#define FOO <iconv.h>
170169
#include FOO
171170
]], [])], [
172171
AC_MSG_RESULT([yes])
173-
AC_DEFINE_UNQUOTED([PHP_ICONV_H_PATH], [<$PHP_ICONV_H_PATH>], [Path to iconv.h])
174172
], [
175173
AC_MSG_RESULT([no])
176174
])

ext/iconv/iconv.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,7 @@
3434

3535
#ifdef HAVE_ICONV
3636

37-
#ifdef PHP_ICONV_H_PATH
38-
#include PHP_ICONV_H_PATH
39-
#else
4037
#include <iconv.h>
41-
#endif
4238

4339
#ifdef HAVE_GLIBC_ICONV
4440
#include <gnu/libc-version.h>

0 commit comments

Comments
 (0)