bjori Wed Dec 20 10:38:25 2006 UTC
Modified files:
/ZendEngine2 zend_API.h
/php-src/main php.h
/php-src/ext/standard basic_functions.c
/php-src/ext/iconv iconv.c
Log:
MFB:
- Fixed incorrect function names on FreeBSD where inet_pton() was named
__inet_pton() and inet_ntop() was named __inet_ntop()
- Fixed bug #39685 (iconv() - undefined function)
- Fixed bug #38852 (XML-RPC Breaks iconv)
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.h?r1=1.275&r2=1.276&diff_format=u
Index: ZendEngine2/zend_API.h
diff -u ZendEngine2/zend_API.h:1.275 ZendEngine2/zend_API.h:1.276
--- ZendEngine2/zend_API.h:1.275 Tue Dec 19 21:38:59 2006
+++ ZendEngine2/zend_API.h Wed Dec 20 10:38:24 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_API.h,v 1.275 2006/12/19 21:38:59 andrei Exp $ */
+/* $Id: zend_API.h,v 1.276 2006/12/20 10:38:24 bjori Exp $ */
#ifndef ZEND_API_H
#define ZEND_API_H
@@ -48,6 +48,9 @@
#define ZEND_FENTRY(zend_name, name, arg_info, flags) { #zend_name, name,
arg_info, (zend_uint) (sizeof(arg_info)/sizeof(struct _zend_arg_info)-1), flags
},
+#define ZEND_RAW_FENTRY(zend_name, name, arg_info, flags) { zend_name, name,
arg_info, (zend_uint) (sizeof(arg_info)/sizeof(struct _zend_arg_info)-1), flags
},
+#define ZEND_RAW_NAMED_FE(zend_name, name, arg_info)
ZEND_RAW_FENTRY(#zend_name, name, arg_info, 0)
+
#define ZEND_NAMED_FE(zend_name, name, arg_info) ZEND_FENTRY(zend_name,
name, arg_info, 0)
#define ZEND_FE(name, arg_info)
ZEND_FENTRY(name, ZEND_FN(name), arg_info, 0)
#define ZEND_DEP_FE(name, arg_info) ZEND_FENTRY(name,
ZEND_FN(name), arg_info, ZEND_ACC_DEPRECATED)
http://cvs.php.net/viewvc.cgi/php-src/main/php.h?r1=1.235&r2=1.236&diff_format=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.235 php-src/main/php.h:1.236
--- php-src/main/php.h:1.235 Fri Nov 17 11:41:13 2006
+++ php-src/main/php.h Wed Dec 20 10:38:24 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php.h,v 1.235 2006/11/17 11:41:13 dmitry Exp $ */
+/* $Id: php.h,v 1.236 2006/12/20 10:38:24 bjori Exp $ */
#ifndef PHP_H
#define PHP_H
@@ -336,6 +336,7 @@
#define PHP_FUNCTION ZEND_FUNCTION
#define PHP_METHOD ZEND_METHOD
+#define PHP_RAW_NAMED_FE ZEND_RAW_NAMED_FE
#define PHP_NAMED_FE ZEND_NAMED_FE
#define PHP_FE ZEND_FE
#define PHP_DEP_FE ZEND_DEP_FE
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.841&r2=1.842&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.841
php-src/ext/standard/basic_functions.c:1.842
--- php-src/ext/standard/basic_functions.c:1.841 Tue Dec 19 22:01:50 2006
+++ php-src/ext/standard/basic_functions.c Wed Dec 20 10:38:24 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.841 2006/12/19 22:01:50 andrei Exp $ */
+/* $Id: basic_functions.c,v 1.842 2006/12/20 10:38:24 bjori Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -3378,10 +3378,10 @@
PHP_FE(number_format,
arginfo_number_format)
PHP_FE(fmod,
arginfo_fmod)
#ifdef HAVE_INET_NTOP
- PHP_NAMED_FE(inet_ntop, php_inet_ntop,
arginfo_inet_ntop)
+ PHP_RAW_NAMED_FE(inet_ntop, php_inet_ntop,
arginfo_inet_ntop)
#endif
#ifdef HAVE_INET_PTON
- PHP_NAMED_FE(inet_pton, php_inet_pton,
arginfo_inet_pton)
+ PHP_RAW_NAMED_FE(inet_pton, php_inet_pton,
arginfo_inet_pton)
#endif
PHP_FE(ip2long,
arginfo_ip2long)
PHP_FE(long2ip,
arginfo_long2ip)
http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/iconv.c?r1=1.147&r2=1.148&diff_format=u
Index: php-src/ext/iconv/iconv.c
diff -u php-src/ext/iconv/iconv.c:1.147 php-src/ext/iconv/iconv.c:1.148
--- php-src/ext/iconv/iconv.c:1.147 Wed Nov 15 18:35:18 2006
+++ php-src/ext/iconv/iconv.c Wed Dec 20 10:38:24 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.147 2006/11/15 18:35:18 iliaa Exp $ */
+/* $Id: iconv.c,v 1.148 2006/12/20 10:38:24 bjori Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -136,7 +136,7 @@
/* {{{ iconv_functions[]
*/
zend_function_entry iconv_functions[] = {
- PHP_NAMED_FE(iconv,php_if_iconv,
arginfo_iconv)
+ PHP_RAW_NAMED_FE(iconv,php_if_iconv,
arginfo_iconv)
PHP_FE(iconv_get_encoding,
arginfo_iconv_get_encoding)
PHP_FE(iconv_set_encoding,
arginfo_iconv_set_encoding)
PHP_FE(iconv_strlen,
arginfo_iconv_strlen)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
