Skip to content

Sync CPP macros in ext/iconv #15191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 1, 2024
Merged

Sync CPP macros in ext/iconv #15191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions build/php.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1825,6 +1825,8 @@ dnl
AC_DEFUN([PHP_SETUP_ICONV], [
found_iconv=no
unset ICONV_DIR
AH_TEMPLATE([HAVE_LIBICONV],
[Define to 1 if you have the 'libiconv' function.])

dnl Check libc first if no path is provided in --with-iconv.
if test "$PHP_ICONV" = "yes"; then
Expand All @@ -1835,7 +1837,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [
found_iconv=yes
],[
AC_CHECK_FUNC([libiconv], [
AC_DEFINE(HAVE_LIBICONV, 1, [ ])
AC_DEFINE([HAVE_LIBICONV], [1])
found_iconv=yes
])
])
Expand Down Expand Up @@ -1869,9 +1871,9 @@ AC_DEFUN([PHP_SETUP_ICONV], [
then
PHP_CHECK_LIBRARY([$iconv_lib_name], [libiconv], [
found_iconv=yes
AC_DEFINE([HAVE_LIBICONV], [1], [ ])
AC_DEFINE([HAVE_LIBICONV], [1])
AC_DEFINE([ICONV_ALIASED_LIBICONV], [1],
[iconv() is aliased to libiconv() in -liconv])
[Define to 1 if 'iconv()' is aliased to 'libiconv()'.])
],
[PHP_CHECK_LIBRARY([$iconv_lib_name], [iconv],
[found_iconv=yes],
Expand Down
40 changes: 20 additions & 20 deletions ext/iconv/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,25 +51,24 @@ if test "$PHP_ICONV" != "no"; then
])
fi

case "$iconv_impl_name" in
gnu_libiconv [)]
AC_DEFINE([PHP_ICONV_IMPL],["libiconv"],[Which iconv implementation to use])
AC_DEFINE([HAVE_LIBICONV],1,[Whether libiconv is used])
;;

bsd [)]
AC_DEFINE([PHP_ICONV_IMPL],["BSD iconv"],[Which iconv implementation to use])
;;

glibc [)]
AC_DEFINE([HAVE_GLIBC_ICONV],1,[glibc's iconv implementation])
AC_DEFINE([PHP_ICONV_IMPL],["glibc"],[Which iconv implementation to use])
;;
ibm [)]
AC_DEFINE([HAVE_IBM_ICONV],1,[IBM iconv implementation])
AC_DEFINE([PHP_ICONV_IMPL],["IBM iconv"],[Which iconv implementation to use])
;;
esac
AH_TEMPLATE([PHP_ICONV_IMPL], [The iconv implementation.])

AS_CASE([$iconv_impl_name],
[gnu_libiconv], [
AC_DEFINE([PHP_ICONV_IMPL], ["libiconv"])
AC_DEFINE([HAVE_LIBICONV], [1])
],
[bsd], [AC_DEFINE([PHP_ICONV_IMPL], ["BSD iconv"])],
[glibc], [
AC_DEFINE([HAVE_GLIBC_ICONV], [1],
[Define to 1 if iconv implementation is glibc.])
AC_DEFINE([PHP_ICONV_IMPL], ["glibc"])
],
[ibm], [
AC_DEFINE([HAVE_IBM_ICONV], [1],
[Define to 1 if iconv implementation is IBM.])
AC_DEFINE([PHP_ICONV_IMPL], ["IBM iconv"])
])

AC_CACHE_CHECK([if iconv supports errno], [php_cv_iconv_errno],
[AC_RUN_IFELSE([AC_LANG_SOURCE([
Expand Down Expand Up @@ -122,7 +121,8 @@ int main(void) {
[php_cv_iconv_ignore=no])])

AS_VAR_IF([php_cv_iconv_ignore], [no],
[AC_DEFINE([ICONV_BROKEN_IGNORE], [1], [Whether iconv has broken IGNORE.])])
[AC_DEFINE([ICONV_BROKEN_IGNORE], [1],
[Define to 1 if iconv has broken IGNORE.])])

LDFLAGS="$save_LDFLAGS"
CFLAGS="$save_CFLAGS"
Expand Down
6 changes: 3 additions & 3 deletions ext/iconv/config.w32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ if (PHP_ICONV != "no") {
EXTENSION("iconv", "iconv.c", PHP_ICONV_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");

AC_DEFINE("HAVE_ICONV", 1, "Define to 1 if PHP extension 'iconv' is available.");
AC_DEFINE("HAVE_LIBICONV", 1, "Define if libiconv is available");
AC_DEFINE("ICONV_ALIASED_LIBICONV", 1, "The iconv function is called iconv() in libiconv");
AC_DEFINE("PHP_ICONV_IMPL", "\"libiconv\"", "Which iconv implementation to use");
AC_DEFINE("HAVE_LIBICONV", 1, "Define to 1 if you have the 'libiconv' function.");
AC_DEFINE("ICONV_ALIASED_LIBICONV", 1, "Define to 1 if 'iconv()' is aliased to 'libiconv()'.");
AC_DEFINE("PHP_ICONV_IMPL", "\"libiconv\"", "The iconv implementation.");
ADD_FLAG("CFLAGS_ICONV", "/D PHP_ICONV_EXPORTS ");
if (!PHP_ICONV_SHARED) {
ADD_DEF_FILE("ext\\iconv\\php_iconv.def");
Expand Down
Loading