sniper Mon Dec 5 20:38:54 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/mysqli mysqli_driver.c mysqli_exception.c mysqli_fe.c
mysqli_warning.c php_mysqli.h
Log:
MFH: nuke php3 legacy
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_driver.c?r1=1.4&r2=1.4.2.1&ty=u
Index: php-src/ext/mysqli/mysqli_driver.c
diff -u php-src/ext/mysqli/mysqli_driver.c:1.4
php-src/ext/mysqli/mysqli_driver.c:1.4.2.1
--- php-src/ext/mysqli/mysqli_driver.c:1.4 Wed Aug 3 10:07:30 2005
+++ php-src/ext/mysqli/mysqli_driver.c Mon Dec 5 20:38:54 2005
@@ -145,7 +145,7 @@
/* {{{ mysqli_driver_methods[]
*/
-function_entry mysqli_driver_methods[] = {
+zend_function_entry mysqli_driver_methods[] = {
PHP_FALIAS(embedded_server_start, mysqli_embedded_server_start, NULL)
PHP_FALIAS(embedded_server_end, mysqli_embedded_server_end, NULL)
{NULL, NULL, NULL}
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_exception.c?r1=1.6&r2=1.6.2.1&ty=u
Index: php-src/ext/mysqli/mysqli_exception.c
diff -u php-src/ext/mysqli/mysqli_exception.c:1.6
php-src/ext/mysqli/mysqli_exception.c:1.6.2.1
--- php-src/ext/mysqli/mysqli_exception.c:1.6 Wed Aug 3 10:07:30 2005
+++ php-src/ext/mysqli/mysqli_exception.c Mon Dec 5 20:38:54 2005
@@ -30,7 +30,7 @@
/* {{{ mysqli_exception_methods[]
*/
-function_entry mysqli_exception_methods[] = {
+zend_function_entry mysqli_exception_methods[] = {
{NULL, NULL, NULL}
};
/* }}} */
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_fe.c?r1=1.49.2.2&r2=1.49.2.3&ty=u
Index: php-src/ext/mysqli/mysqli_fe.c
diff -u php-src/ext/mysqli/mysqli_fe.c:1.49.2.2
php-src/ext/mysqli/mysqli_fe.c:1.49.2.3
--- php-src/ext/mysqli/mysqli_fe.c:1.49.2.2 Tue Oct 18 06:02:36 2005
+++ php-src/ext/mysqli/mysqli_fe.c Mon Dec 5 20:38:54 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_fe.c,v 1.49.2.2 2005/10/18 10:02:36 tony2001 Exp $
+ $Id: mysqli_fe.c,v 1.49.2.3 2005/12/06 01:38:54 sniper Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -50,7 +50,7 @@
*
* Every user visible function must have an entry in mysqli_functions[].
*/
-function_entry mysqli_functions[] = {
+zend_function_entry mysqli_functions[] = {
PHP_FE(mysqli_affected_rows,
NULL)
PHP_FE(mysqli_autocommit,
NULL)
PHP_FE(mysqli_change_user,
NULL)
@@ -183,7 +183,7 @@
*
* Every user visible function must have an entry in mysqli_functions[].
*/
-function_entry mysqli_link_methods[] = {
+zend_function_entry mysqli_link_methods[] = {
PHP_FALIAS(autocommit,mysqli_autocommit,NULL)
PHP_FALIAS(change_user,mysqli_change_user,NULL)
PHP_FALIAS(character_set_name, mysqli_character_set_name,NULL)
@@ -244,7 +244,7 @@
*
* Every user visible function must have an entry in mysqli_result_functions[].
*/
-function_entry mysqli_result_methods[] = {
+zend_function_entry mysqli_result_methods[] = {
PHP_FALIAS(mysqli_result, mysqli_result_construct, NULL)
PHP_FALIAS(close,mysqli_free_result,NULL)
PHP_FALIAS(free,mysqli_free_result,NULL)
@@ -267,7 +267,7 @@
*
* Every user visible function must have an entry in mysqli_stmt_functions[].
*/
-function_entry mysqli_stmt_methods[] = {
+zend_function_entry mysqli_stmt_methods[] = {
PHP_FALIAS(mysqli_stmt, mysqli_stmt_construct, NULL)
PHP_FALIAS(attr_get,mysqli_stmt_attr_get,NULL)
PHP_FALIAS(attr_set,mysqli_stmt_attr_set,NULL)
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_warning.c?r1=1.5.2.3&r2=1.5.2.4&ty=u
Index: php-src/ext/mysqli/mysqli_warning.c
diff -u php-src/ext/mysqli/mysqli_warning.c:1.5.2.3
php-src/ext/mysqli/mysqli_warning.c:1.5.2.4
--- php-src/ext/mysqli/mysqli_warning.c:1.5.2.3 Wed Oct 12 09:31:46 2005
+++ php-src/ext/mysqli/mysqli_warning.c Mon Dec 5 20:38:54 2005
@@ -211,7 +211,7 @@
}
/* }}} */
-function_entry mysqli_warning_methods[] = {
+zend_function_entry mysqli_warning_methods[] = {
PHP_ME(mysqli_warning, __construct, NULL,
ZEND_ACC_PROTECTED)
PHP_ME(mysqli_warning, next, NULL, ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
http://cvs.php.net/diff.php/php-src/ext/mysqli/php_mysqli.h?r1=1.54.2.3&r2=1.54.2.4&ty=u
Index: php-src/ext/mysqli/php_mysqli.h
diff -u php-src/ext/mysqli/php_mysqli.h:1.54.2.3
php-src/ext/mysqli/php_mysqli.h:1.54.2.4
--- php-src/ext/mysqli/php_mysqli.h:1.54.2.3 Thu Dec 1 09:12:56 2005
+++ php-src/ext/mysqli/php_mysqli.h Mon Dec 5 20:38:54 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: php_mysqli.h,v 1.54.2.3 2005/12/01 14:12:56 andrey Exp $
+ $Id: php_mysqli.h,v 1.54.2.4 2005/12/06 01:38:54 sniper Exp $
*/
/* A little hack to prevent build break, when mysql is used together with
@@ -121,13 +121,13 @@
#define PHP_MYSQLI_EXPORT(__type) PHP_MYSQLI_API __type
extern zend_module_entry mysqli_module_entry;
-extern function_entry mysqli_functions[];
-extern function_entry mysqli_link_methods[];
-extern function_entry mysqli_stmt_methods[];
-extern function_entry mysqli_result_methods[];
-extern function_entry mysqli_driver_methods[];
-extern function_entry mysqli_warning_methods[];
-extern function_entry mysqli_exception_methods[];
+extern zend_function_entry mysqli_functions[];
+extern zend_function_entry mysqli_link_methods[];
+extern zend_function_entry mysqli_stmt_methods[];
+extern zend_function_entry mysqli_result_methods[];
+extern zend_function_entry mysqli_driver_methods[];
+extern zend_function_entry mysqli_warning_methods[];
+extern zend_function_entry mysqli_exception_methods[];
extern mysqli_property_entry mysqli_link_property_entries[];
extern mysqli_property_entry mysqli_result_property_entries[];
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
