From: Andrey Hristov <andrey@php.net>
Date: Tue, 16 Oct 2007 20:56:22 +0000 (+0000)
Subject: Sync mysqlnd. Should still compile with 5_2 for those who want to use the
X-Git-Tag: RELEASE_1_3_1~840
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a2e9e60435021447aa877531138b0ce95f255b0;p=php

Sync mysqlnd. Should still compile with 5_2 for those who want to use the
current stable branch. mysqli from 5_3 patched for mysqlnd should be also
compilable with 5_2.
---

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index c2fda21b0e..7aca237494 100644
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -315,6 +315,14 @@ static int mysqli_write_na(mysqli_object *obj, zval *newval TSRMLS_DC)
 }
 /* }}} */
 
+#ifndef Z_ADDREF_P
+/* PHP 5.2, old GC */
+#define Z_ADDREF_P(pz)				(++(pz)->refcount)
+#define Z_REFCOUNT_P(pz)			((pz)->refcount)
+#define Z_SET_REFCOUNT_P(pz, rc)	((pz)->refcount = rc)
+#endif
+
+
 /* {{{ mysqli_read_property */
 zval *mysqli_read_property(zval *object, zval *member, int type TSRMLS_DC)
 {
diff --git a/ext/mysqlnd/mysqlnd_priv.h b/ext/mysqlnd/mysqlnd_priv.h
index 83bc0665cb..cd3f11cbb4 100644
--- a/ext/mysqlnd/mysqlnd_priv.h
+++ b/ext/mysqlnd/mysqlnd_priv.h
@@ -23,6 +23,16 @@
 #ifndef MYSQLND_PRIV_H
 #define MYSQLND_PRIV_H
 
+#ifndef Z_ADDREF_P
+/* PHP 5.2, old GC */
+#define Z_ADDREF_P(pz)				(++(pz)->refcount)
+#define Z_DELREF_P(pz)				(--(pz)->refcount)
+#define Z_REFCOUNT_P(pz)			((pz)->refcount)
+#define Z_SET_REFCOUNT_P(pz, rc)	((pz)->refcount = rc)
+#define Z_REFCOUNT_PP(ppz)			Z_REFCOUNT_P(*(ppz))
+#define Z_DELREF_PP(ppz)			Z_DELREF_P(*(ppz))
+#endif
+
 #ifdef ZTS
 #include "TSRM.h"
 #endif