diff options
| author | Kalle Sommer Nielsen <kalle@php.net> | 2010-03-08 15:51:08 +0000 |
|---|---|---|
| committer | Kalle Sommer Nielsen <kalle@php.net> | 2010-03-08 15:51:08 +0000 |
| commit | 8332a9c163f1b5d785dbdbd178ca293504058b54 (patch) | |
| tree | 1e61ea2cd39b61270e89429976a3385f0a9faef7 | |
| parent | 5df4c81001ef0ce6a405cf0239b24cd76107ce73 (diff) | |
| download | php-git-8332a9c163f1b5d785dbdbd178ca293504058b54.tar.gz | |
Rename the HAVE_LIBICONV_IN_LIBICONV macro to ICONV_ALIASED_LIBICONV, making it less cryptic
| -rw-r--r-- | acinclude.m4 | 6 | ||||
| -rw-r--r-- | ext/iconv/config.w32 | 2 | ||||
| -rw-r--r-- | ext/iconv/iconv.c | 2 | ||||
| -rw-r--r-- | ext/iconv/php_iconv.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index f6cf1ca6de..c8c070f588 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -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 diff --git a/ext/iconv/config.w32 b/ext/iconv/config.w32 index 6baa182c03..7bc649e2ad 100644 --- a/ext/iconv/config.w32 +++ b/ext/iconv/config.w32 @@ -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 "); diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index c85b0a21a6..35f6d4be80 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -176,7 +176,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 diff --git a/ext/iconv/php_iconv.h b/ext/iconv/php_iconv.h index ff65167c2c..ce8feaf9a8 100644 --- a/ext/iconv/php_iconv.h +++ b/ext/iconv/php_iconv.h @@ -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" |