clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename the HAVE_LIBICONV_IN_LIBICONV macro to ICONV_ALIASED_LIBICONV, making it less cryptic

Browse Source
This commit is contained in:
Kalle Sommer Nielsen 2010-03-08 15:51:08 +00:00
parent d42fd45f97
commit 62f087df75
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
acinclude.m4
View File

@ -2424,7 +2424,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [
echo > ext/iconv/php_have_libiconv.h
echo > ext/iconv/php_have_iconv.h
echo > ext/iconv/php_php_iconv_impl.h
echo > ext/iconv/php_have_libiconv_in_libiconv.h
echo > ext/iconv/php_iconv_aliased_libiconv.h
echo > ext/iconv/php_php_iconv_h_path.h
echo > ext/iconv/php_iconv_supports_errno.h
@ -2472,8 +2472,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [
found_iconv=yes
PHP_DEFINE(HAVE_LIBICONV,1,[ext/iconv])
AC_DEFINE(HAVE_LIBICONV,1,[ ])
PHP_DEFINE([HAVE_LIBICONV_IN_LIBICONV],1,[ext/iconv])
AC_DEFINE([HAVE_LIBICONV_IN_LIBICONV],1,[iconv() is aliased to libiconv() in -liconv])
PHP_DEFINE([ICONV_ALIASED_LIBICONV],1,[ext/iconv])
AC_DEFINE([ICONV_ALIASED_LIBICONV],1,[iconv() is aliased to libiconv() in -liconv])
], [
PHP_CHECK_LIBRARY($iconv_lib_name, iconv, [
found_iconv=yes

2
ext/iconv/config.w32
View File

@ -12,7 +12,7 @@ if (PHP_ICONV != "no") {
AC_DEFINE("HAVE_ICONV", 1, "Define if iconv extension is enabled");
AC_DEFINE("HAVE_LIBICONV", 1, "Define if libiconv is available");
AC_DEFINE("HAVE_LIBICONV_IN_LIBICONV", 1, "The iconv function is called iconv() in libiconv");
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("ICONV_SUPPORTS_ERRNO", 1, "Whether iconv supports errno or not");
ADD_FLAG("CFLAGS_ICONV", "/D PHP_ICONV_EXPORTS ");

2
ext/iconv/iconv.c
View File

@ -182,7 +182,7 @@ static PHP_GINIT_FUNCTION(iconv)
}
/* }}} */
#if defined(HAVE_LIBICONV) && defined(HAVE_LIBICONV_IN_LIBICONV)
#if defined(HAVE_LIBICONV) && defined(ICONV_ALIASED_LIBICONV)
#define iconv libiconv
#endif

2
ext/iconv/php_iconv.h
View File

@ -37,7 +37,7 @@
#ifdef PHP_ATOM_INC
#include "ext/iconv/php_have_iconv.h"
#include "ext/iconv/php_have_libiconv.h"
#include "ext/iconv/php_have_libiconv_in_libiconv.h"
#include "ext/iconv/php_iconv_aliased_libiconv.h"
#include "ext/iconv/php_have_glibc_iconv.h"
#include "ext/iconv/php_have_bsd_iconv.h"
#include "ext/iconv/php_have_ibm_iconv.h"