Rename the HAVE_LIBICONV_IN_LIBICONV macro to ICONV_ALIASED_LIBICONV, making it less...

diff --git a/acinclude.m4 b/acinclude.m4
index f6cf1ca6de74fed8b8efcb2faadc3af87e013258..c8c070f588efd33bdb326bdfefdb9d2bda35c54a 100644 (file)
--- 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 6baa182c03685e48040818b394ffce43d3a6e77d..7bc649e2ad71f3fe67b2b496ec1bfd2aa626eaf9 100644 (file)
--- 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 c85b0a21a678a20b9315e21ea5ad378cf17015ad..35f6d4be80a44b9923f0d456d0c7e426ce107c92 100644 (file)
--- 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 ff65167c2c1a22bb679afc32b38821c65dd538ae..ce8feaf9a8b20aed4b603a7ef62f493f3a04e263 100644 (file)
--- 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"