andrey Tue, 22 Nov 2011 16:38:06 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=319690
Log:
use the method in all builds. Thus it can be used for detection
of state transitioning in every case
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_priv.h
U php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_priv.h
U php/php-src/trunk/ext/mysqlnd/mysqlnd_priv.h
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_priv.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_priv.h 2011-11-22
16:27:35 UTC (rev 319689)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_priv.h 2011-11-22
16:38:06 UTC (rev 319690)
@@ -147,16 +147,9 @@
#define SET_STMT_ERROR(stmt, a, b, c) SET_CLIENT_ERROR((stmt)->error_info, a,
b, c)
-
-#ifdef ZTS
#define CONN_GET_STATE(c) (c)->m->get_state((c) TSRMLS_CC)
#define CONN_SET_STATE(c, s) (c)->m->set_state((c), (s) TSRMLS_CC)
-#else
-#define CONN_GET_STATE(c) ((c)->state)
-#define CONN_SET_STATE(c, s) ((c)->state = (s))
-#endif
-
/* PS stuff */
typedef void (*ps_field_fetch_func)(zval *zv, const MYSQLND_FIELD * const
field,
unsigned int pack_len, zend_uchar **row,
Modified: php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_priv.h
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_priv.h 2011-11-22
16:27:35 UTC (rev 319689)
+++ php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_priv.h 2011-11-22
16:38:06 UTC (rev 319690)
@@ -170,16 +170,9 @@
#define SET_STMT_ERROR(stmt, a, b, c) SET_CLIENT_ERROR(*(stmt)->error_info,
a, b, c)
-
-#ifdef ZTS
#define CONN_GET_STATE(c) (c)->m->get_state((c) TSRMLS_CC)
#define CONN_SET_STATE(c, s) (c)->m->set_state((c), (s) TSRMLS_CC)
-#else
-#define CONN_GET_STATE(c) ((c)->state)
-#define CONN_SET_STATE(c, s) ((c)->state = (s))
-#endif
-
/* PS stuff */
typedef void (*ps_field_fetch_func)(zval *zv, const MYSQLND_FIELD * const
field,
unsigned int pack_len, zend_uchar **row,
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_priv.h
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_priv.h 2011-11-22 16:27:35 UTC
(rev 319689)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_priv.h 2011-11-22 16:38:06 UTC
(rev 319690)
@@ -170,16 +170,9 @@
#define SET_STMT_ERROR(stmt, a, b, c) SET_CLIENT_ERROR(*(stmt)->error_info,
a, b, c)
-
-#ifdef ZTS
#define CONN_GET_STATE(c) (c)->m->get_state((c) TSRMLS_CC)
#define CONN_SET_STATE(c, s) (c)->m->set_state((c), (s) TSRMLS_CC)
-#else
-#define CONN_GET_STATE(c) ((c)->state)
-#define CONN_SET_STATE(c, s) ((c)->state = (s))
-#endif
-
/* PS stuff */
typedef void (*ps_field_fetch_func)(zval *zv, const MYSQLND_FIELD * const
field,
unsigned int pack_len, zend_uchar **row,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
