andrey                                   Mon, 11 Jan 2010 19:13:43 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=293424

Log:
remove extern defintion of a variable that is no more
used outside of the file where it is declared.
Also really export with PHPAPI the protocol init/deinit functions

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
    U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.h
    U   php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c
    U   php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.h

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c     
2010-01-11 19:13:17 UTC (rev 293423)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c     
2010-01-11 19:13:43 UTC (rev 293424)
@@ -61,8 +61,6 @@
        }


-extern mysqlnd_packet_methods packet_methods[];
-
 static const char *unknown_sqlstate= "HY000";

 char * const mysqlnd_empty_string = "";
@@ -1714,6 +1712,7 @@

 /* {{{ packet_methods
  */
+static
 mysqlnd_packet_methods packet_methods[PROT_LAST] =
 {
        {
@@ -1931,7 +1930,7 @@


 /* {{{ mysqlnd_protocol_init */
-MYSQLND_PROTOCOL *
+PHPAPI MYSQLND_PROTOCOL *
 mysqlnd_protocol_init(zend_bool persistent TSRMLS_DC)
 {
        size_t alloc_size = sizeof(MYSQLND_PROTOCOL) + mysqlnd_plugin_count() * 
sizeof(void *);
@@ -1959,7 +1958,7 @@


 /* {{{ mysqlnd_protocol_free */
-void
+PHPAPI void
 mysqlnd_protocol_free(MYSQLND_PROTOCOL * const protocol TSRMLS_DC)
 {
        zend_bool pers = protocol->persistent;

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-11 19:13:17 UTC (rev 293423)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.h     
2010-01-11 19:13:43 UTC (rev 293424)
@@ -54,9 +54,7 @@
        void                            (*free_mem)(void *packet, zend_bool 
alloca TSRMLS_DC);
 } mysqlnd_packet_methods;

-extern mysqlnd_packet_methods packet_methods[];

-
 typedef struct st_mysqlnd_packet_header {
        size_t          size;
        mysqlnd_packet_methods *m;

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c        2010-01-11 
19:13:17 UTC (rev 293423)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c        2010-01-11 
19:13:43 UTC (rev 293424)
@@ -61,8 +61,6 @@
        }


-extern mysqlnd_packet_methods packet_methods[];
-
 static const char *unknown_sqlstate= "HY000";

 char * const mysqlnd_empty_string = "";
@@ -1714,6 +1712,7 @@

 /* {{{ packet_methods
  */
+static
 mysqlnd_packet_methods packet_methods[PROT_LAST] =
 {
        {
@@ -1931,7 +1930,7 @@


 /* {{{ mysqlnd_protocol_init */
-MYSQLND_PROTOCOL *
+PHPAPI MYSQLND_PROTOCOL *
 mysqlnd_protocol_init(zend_bool persistent TSRMLS_DC)
 {
        size_t alloc_size = sizeof(MYSQLND_PROTOCOL) + mysqlnd_plugin_count() * 
sizeof(void *);
@@ -1959,7 +1958,7 @@


 /* {{{ mysqlnd_protocol_free */
-void
+PHPAPI void
 mysqlnd_protocol_free(MYSQLND_PROTOCOL * const protocol TSRMLS_DC)
 {
        zend_bool pers = protocol->persistent;

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.h
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.h        2010-01-11 
19:13:17 UTC (rev 293423)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.h        2010-01-11 
19:13:43 UTC (rev 293424)
@@ -54,9 +54,7 @@
        void                            (*free_mem)(void *packet, zend_bool 
alloca TSRMLS_DC);
 } mysqlnd_packet_methods;

-extern mysqlnd_packet_methods packet_methods[];

-
 typedef struct st_mysqlnd_packet_header {
        size_t          size;
        mysqlnd_packet_methods *m;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to