andrey Fri, 08 Jan 2010 18:52:08 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=293287
Log:
export some calls to init/deinit code outside of the module
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.h
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_statistics.c
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_statistics.h
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.h
U php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_net.h
U php/php-src/trunk/ext/mysqlnd/mysqlnd_statistics.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_statistics.h
U php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.h
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c 2010-01-08
17:35:20 UTC (rev 293286)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c 2010-01-08
18:52:08 UTC (rev 293287)
@@ -658,7 +658,7 @@
/* {{{ mysqlnd_net_init */
-MYSQLND_NET *
+PHPAPI MYSQLND_NET *
mysqlnd_net_init(zend_bool persistent TSRMLS_DC)
{
size_t alloc_size = sizeof(MYSQLND_NET) + mysqlnd_plugin_count() *
sizeof(void *);
@@ -689,7 +689,7 @@
/* {{{ mysqlnd_net_free */
-void
+PHPAPI void
mysqlnd_net_free(MYSQLND_NET * const net TSRMLS_DC)
{
zend_bool pers = net->persistent;
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.h 2010-01-08
17:35:20 UTC (rev 293286)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.h 2010-01-08
18:52:08 UTC (rev 293287)
@@ -23,8 +23,8 @@
#ifndef MYSQLND_NET_H
#define MYSQLND_NET_H
-MYSQLND_NET * mysqlnd_net_init(zend_bool persistent TSRMLS_DC);
-void mysqlnd_net_free(MYSQLND_NET * const net TSRMLS_DC);
+PHPAPI MYSQLND_NET * mysqlnd_net_init(zend_bool persistent TSRMLS_DC);
+PHPAPI void mysqlnd_net_free(MYSQLND_NET * const net TSRMLS_DC);
#endif /* MYSQLND_NET_H */
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_statistics.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_statistics.c
2010-01-08 17:35:20 UTC (rev 293286)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_statistics.c
2010-01-08 18:52:08 UTC (rev 293287)
@@ -236,7 +236,7 @@
/* {{{ mysqlnd_stats_init */
-void
+PHPAPI void
mysqlnd_stats_init(MYSQLND_STATS ** stats)
{
*stats = calloc(1, sizeof(MYSQLND_STATS));
@@ -250,7 +250,7 @@
/* {{{ mysqlnd_stats_end */
-void
+PHPAPI void
mysqlnd_stats_end(MYSQLND_STATS * stats)
{
#ifdef ZTS
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_statistics.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_statistics.h
2010-01-08 17:35:20 UTC (rev 293286)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_statistics.h
2010-01-08 18:52:08 UTC (rev 293287)
@@ -220,8 +220,8 @@
TSRMLS_DC
ZEND_FILE_LINE_DC);
-void mysqlnd_stats_init(MYSQLND_STATS ** stats);
-void mysqlnd_stats_end(MYSQLND_STATS * stats);
+PHPAPI void mysqlnd_stats_init(MYSQLND_STATS ** stats);
+PHPAPI void mysqlnd_stats_end(MYSQLND_STATS * stats);
#endif /* MYSQLND_STATISTICS_H */
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.h
2010-01-08 17:35:20 UTC (rev 293286)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.h
2010-01-08 18:52:08 UTC (rev 293287)
@@ -270,8 +270,8 @@
MYSQLND_STATS * stats TSRMLS_DC);
-MYSQLND_PROTOCOL * mysqlnd_protocol_init(zend_bool persistent TSRMLS_DC);
-void mysqlnd_protocol_free(MYSQLND_PROTOCOL * net TSRMLS_DC);
+PHPAPI MYSQLND_PROTOCOL * mysqlnd_protocol_init(zend_bool persistent
TSRMLS_DC);
+PHPAPI void mysqlnd_protocol_free(MYSQLND_PROTOCOL * net TSRMLS_DC);
#endif /* MYSQLND_WIREPROTOCOL_H */
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c 2010-01-08 17:35:20 UTC (rev
293286)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c 2010-01-08 18:52:08 UTC (rev
293287)
@@ -658,7 +658,7 @@
/* {{{ mysqlnd_net_init */
-MYSQLND_NET *
+PHPAPI MYSQLND_NET *
mysqlnd_net_init(zend_bool persistent TSRMLS_DC)
{
size_t alloc_size = sizeof(MYSQLND_NET) + mysqlnd_plugin_count() *
sizeof(void *);
@@ -689,7 +689,7 @@
/* {{{ mysqlnd_net_free */
-void
+PHPAPI void
mysqlnd_net_free(MYSQLND_NET * const net TSRMLS_DC)
{
zend_bool pers = net->persistent;
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_net.h
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_net.h 2010-01-08 17:35:20 UTC (rev
293286)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_net.h 2010-01-08 18:52:08 UTC (rev
293287)
@@ -23,8 +23,8 @@
#ifndef MYSQLND_NET_H
#define MYSQLND_NET_H
-MYSQLND_NET * mysqlnd_net_init(zend_bool persistent TSRMLS_DC);
-void mysqlnd_net_free(MYSQLND_NET * const net TSRMLS_DC);
+PHPAPI MYSQLND_NET * mysqlnd_net_init(zend_bool persistent TSRMLS_DC);
+PHPAPI void mysqlnd_net_free(MYSQLND_NET * const net TSRMLS_DC);
#endif /* MYSQLND_NET_H */
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_statistics.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_statistics.c 2010-01-08 17:35:20 UTC
(rev 293286)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_statistics.c 2010-01-08 18:52:08 UTC
(rev 293287)
@@ -236,7 +236,7 @@
/* {{{ mysqlnd_stats_init */
-void
+PHPAPI void
mysqlnd_stats_init(MYSQLND_STATS ** stats)
{
*stats = calloc(1, sizeof(MYSQLND_STATS));
@@ -250,7 +250,7 @@
/* {{{ mysqlnd_stats_end */
-void
+PHPAPI void
mysqlnd_stats_end(MYSQLND_STATS * stats)
{
#ifdef ZTS
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_statistics.h
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_statistics.h 2010-01-08 17:35:20 UTC
(rev 293286)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_statistics.h 2010-01-08 18:52:08 UTC
(rev 293287)
@@ -220,8 +220,8 @@
TSRMLS_DC
ZEND_FILE_LINE_DC);
-void mysqlnd_stats_init(MYSQLND_STATS ** stats);
-void mysqlnd_stats_end(MYSQLND_STATS * stats);
+PHPAPI void mysqlnd_stats_init(MYSQLND_STATS ** stats);
+PHPAPI void mysqlnd_stats_end(MYSQLND_STATS * stats);
#endif /* MYSQLND_STATISTICS_H */
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.h
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.h 2010-01-08
17:35:20 UTC (rev 293286)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.h 2010-01-08
18:52:08 UTC (rev 293287)
@@ -270,8 +270,8 @@
MYSQLND_STATS * stats TSRMLS_DC);
-MYSQLND_PROTOCOL * mysqlnd_protocol_init(zend_bool persistent TSRMLS_DC);
-void mysqlnd_protocol_free(MYSQLND_PROTOCOL * net TSRMLS_DC);
+PHPAPI MYSQLND_PROTOCOL * mysqlnd_protocol_init(zend_bool persistent
TSRMLS_DC);
+PHPAPI void mysqlnd_protocol_free(MYSQLND_PROTOCOL * net TSRMLS_DC);
#endif /* MYSQLND_WIREPROTOCOL_H */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
