tony2001 Fri, 02 Apr 2010 08:07:16 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=297326
Log:
merge 295848 by Philip's request
Changed paths:
_U php/php-src/branches/PHP_5_3_FPM/
U php/php-src/branches/PHP_5_3_FPM/acinclude.m4
U php/php-src/branches/PHP_5_3_FPM/ext/iconv/iconv.c
U php/php-src/branches/PHP_5_3_FPM/ext/iconv/php_iconv.h
_U php/php-src/branches/PHP_5_3_FPM/ext/tidy/tests/
_U
php/php-src/branches/PHP_5_3_FPM/tests/security/open_basedir_parse_ini_file.phpt
Property changes on: php/php-src/branches/PHP_5_3_FPM
___________________________________________________________________
Modified: svn:mergeinfo
- /php/php-src/trunk:284726
+ /php/php-src/branches/PHP_5_3:295848
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_FPM/acinclude.m4
===================================================================
--- php/php-src/branches/PHP_5_3_FPM/acinclude.m4 2010-04-02 07:55:43 UTC
(rev 297325)
+++ php/php-src/branches/PHP_5_3_FPM/acinclude.m4 2010-04-02 08:07:16 UTC
(rev 297326)
@@ -2424,6 +2424,7 @@
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_php_iconv_h_path.h
echo > ext/iconv/php_iconv_supports_errno.h
@@ -2471,6 +2472,8 @@
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_CHECK_LIBRARY($iconv_lib_name, iconv, [
found_iconv=yes
Modified: php/php-src/branches/PHP_5_3_FPM/ext/iconv/iconv.c
===================================================================
--- php/php-src/branches/PHP_5_3_FPM/ext/iconv/iconv.c 2010-04-02 07:55:43 UTC
(rev 297325)
+++ php/php-src/branches/PHP_5_3_FPM/ext/iconv/iconv.c 2010-04-02 08:07:16 UTC
(rev 297326)
@@ -182,7 +182,7 @@
}
/* }}} */
-#ifdef HAVE_LIBICONV
+#if defined(HAVE_LIBICONV) && defined(HAVE_LIBICONV_IN_LIBICONV)
#define iconv libiconv
#endif
Modified: php/php-src/branches/PHP_5_3_FPM/ext/iconv/php_iconv.h
===================================================================
--- php/php-src/branches/PHP_5_3_FPM/ext/iconv/php_iconv.h 2010-04-02
07:55:43 UTC (rev 297325)
+++ php/php-src/branches/PHP_5_3_FPM/ext/iconv/php_iconv.h 2010-04-02
08:07:16 UTC (rev 297326)
@@ -37,6 +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_have_glibc_iconv.h"
#include "ext/iconv/php_have_bsd_iconv.h"
#include "ext/iconv/php_have_ibm_iconv.h"
Property changes on: php/php-src/branches/PHP_5_3_FPM/ext/tidy/tests
___________________________________________________________________
Modified: svn:mergeinfo
- /php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+ /php/php-src/branches/PHP_5_3/ext/tidy/tests:295848
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Property changes on:
php/php-src/branches/PHP_5_3_FPM/tests/security/open_basedir_parse_ini_file.phpt
___________________________________________________________________
Modified: svn:mergeinfo
- /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
+
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:295848
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
