andrey Tue May 6 17:05:14 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqli mysqli.c mysqli_nonapi.c
Log:
Make mysqli compilable in a 5_2 environment. Some want to use mysqlnd+mysqli
with 5_2. This won't hurt 5_2 in any way. Won't be MFB-ed because HEAD is
completely different.
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.23&r2=1.72.2.16.2.17.2.24&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.23
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.24
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.23 Tue Mar 18 17:30:55 2008
+++ php-src/ext/mysqli/mysqli.c Tue May 6 17:05:14 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
- $Id: mysqli.c,v 1.72.2.16.2.17.2.23 2008/03/18 17:30:55 andrey Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.17.2.24 2008/05/06 17:05:14 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -512,6 +512,7 @@
} /* }}} */
+#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 3
HashTable * mysqli_object_get_debug_info(zval *object, int *is_temp TSRMLS_DC)
{
mysqli_object *obj = (mysqli_object *)zend_objects_get_address(object
TSRMLS_CC);
@@ -539,7 +540,7 @@
*is_temp = 1;
return retval;
}
-
+#endif
/* {{{ mysqli_objects_new
*/
@@ -708,7 +709,9 @@
mysqli_object_handlers.get_property_ptr_ptr =
std_hnd->get_property_ptr_ptr;
mysqli_object_handlers.get_constructor = php_mysqli_constructor_get;
mysqli_object_handlers.has_property = mysqli_object_has_property;
+#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 3
mysqli_object_handlers.get_debug_info = mysqli_object_get_debug_info;
+#endif
zend_hash_init(&classes, 0, NULL, NULL, 1);
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.54.2.7.2.5.2.11&r2=1.54.2.7.2.5.2.12&diff_format=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7.2.5.2.11
php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7.2.5.2.12
--- php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7.2.5.2.11 Thu Apr 24
14:22:19 2008
+++ php-src/ext/mysqli/mysqli_nonapi.c Tue May 6 17:05:14 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
- $Id: mysqli_nonapi.c,v 1.54.2.7.2.5.2.11 2008/04/24 14:22:19 andrey Exp $
+ $Id: mysqli_nonapi.c,v 1.54.2.7.2.5.2.12 2008/05/06 17:05:14 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -33,6 +33,11 @@
#define SAFE_STR(a) ((a)?a:"")
+#ifndef zend_parse_parameters_none
+#define zend_parse_parameters_none() \
+ zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "")
+#endif
+
/* {{{ php_mysqli_set_error
*/
static void php_mysqli_set_error(long mysql_errno, char *mysql_err TSRMLS_DC)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
