From: Johannes Schlüter <johannes@php.net>
Date: Wed, 18 May 2011 10:21:28 +0000 (+0000)
Subject: - Keep the old arginfo for now
X-Git-Tag: php-5.5.0alpha1~2072
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f0b306af39208929c151a6dcfd6b2b374d091bf1;p=php

- 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
---

diff --git a/ext/mysqli/mysqli_fe.c b/ext/mysqli/mysqli_fe.c
index bbc1ff3982..6d80c5507c 100644
--- a/ext/mysqli/mysqli_fe.c
+++ b/ext/mysqli/mysqli_fe.c
@@ -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)