johannes Wed, 18 May 2011 10:21:28 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=311177
Log:
- Keep the old arginfo for now
# This change we would E_RECOVERABLE instead of E_WARNING
# and needs some more review, as well fixing ~80 tests
Changed paths:
U php/php-src/branches/PHP_5_4/ext/mysqli/mysqli_fe.c
U php/php-src/trunk/ext/mysqli/mysqli_fe.c
Modified: php/php-src/branches/PHP_5_4/ext/mysqli/mysqli_fe.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqli/mysqli_fe.c 2011-05-18 10:09:02 UTC
(rev 311176)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/mysqli_fe.c 2011-05-18 10:21:28 UTC
(rev 311177)
@@ -33,7 +33,7 @@
#include "mysqli_fe.h"
#include "mysqli_priv.h"
-#if PHP_VERSION_ID >= 50400
+#ifdef MYSQLI_USE_FULL_TYPED_ARGINFO_0
#define MYSQLI_ZEND_ARG_OBJ_INFO_LINK() ZEND_ARG_OBJ_INFO(0, link, mysqli, 0)
#define MYSQLI_ZEND_ARG_OBJ_INFO_RESULT() ZEND_ARG_OBJ_INFO(0, result,
mysqli_result, 0)
#define MYSQLI_ZEND_ARG_OBJ_INFO_STMT() ZEND_ARG_OBJ_INFO(0, stmt,
mysqli_stmt, 0)
Modified: php/php-src/trunk/ext/mysqli/mysqli_fe.c
===================================================================
--- php/php-src/trunk/ext/mysqli/mysqli_fe.c 2011-05-18 10:09:02 UTC (rev
311176)
+++ php/php-src/trunk/ext/mysqli/mysqli_fe.c 2011-05-18 10:21:28 UTC (rev
311177)
@@ -33,7 +33,7 @@
#include "mysqli_fe.h"
#include "mysqli_priv.h"
-#if PHP_VERSION_ID >= 50400
+#ifdef MYSQLI_USE_FULL_TYPED_ARGINFO_0
#define MYSQLI_ZEND_ARG_OBJ_INFO_LINK() ZEND_ARG_OBJ_INFO(0, link, mysqli, 0)
#define MYSQLI_ZEND_ARG_OBJ_INFO_RESULT() ZEND_ARG_OBJ_INFO(0, result,
mysqli_result, 0)
#define MYSQLI_ZEND_ARG_OBJ_INFO_STMT() ZEND_ARG_OBJ_INFO(0, stmt,
mysqli_stmt, 0)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
