fix debug windows build as well as remove a compilation warning

(a header not included)

diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index d0de0738374eacbc2e0ed489dedd5456ee188083..365068d60c42d0d3ab85c53f12447d8abe4998e0 100644 (file)
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -157,7 +157,7 @@ MYSQLND_METHOD(mysqlnd_conn, free_contents)(MYSQLND *conn TSRMLS_DC)
        }
 #ifdef MYSQLND_COMPRESSION_ENABLED
        if (conn->net.uncompressed_data) {
-               conn->net.uncompressed_data->free(&conn->net.uncompressed_data TSRMLS_CC);
+               conn->net.uncompressed_data->free_buffer(&conn->net.uncompressed_data TSRMLS_CC);
        }
 #endif
 

diff --git a/ext/mysqlnd/mysqlnd_ps.c b/ext/mysqlnd/mysqlnd_ps.c
index 9fc1d5d6601b94d61bd365966613fe6aefa5e68e..38c554306c31a972ae4f48bab5e44fd095df94a1 100644 (file)
--- a/ext/mysqlnd/mysqlnd_ps.c
+++ b/ext/mysqlnd/mysqlnd_ps.c
@@ -27,6 +27,7 @@
 #include "mysqlnd_result_meta.h"
 #include "mysqlnd_statistics.h"
 #include "mysqlnd_debug.h"
+#include "mysqlnd_block_alloc.h"
 
 
 #define MYSQLND_SILENT

diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h
index 0763e0148d2b2af0b3caaed7207129626024be32..f4485f1d1e73671317e8826bb8f897bbd39c0443 100644 (file)
--- a/ext/mysqlnd/mysqlnd_structs.h
+++ b/ext/mysqlnd/mysqlnd_structs.h
@@ -225,7 +225,7 @@ typedef struct st_mysqlnd_read_buffer {
        zend_bool       (*is_empty)(struct st_mysqlnd_read_buffer *);
        void            (*read)(struct st_mysqlnd_read_buffer *, size_t count, zend_uchar * dest);
        size_t          (*bytes_left)(struct st_mysqlnd_read_buffer *);
-       void            (*free)(struct st_mysqlnd_read_buffer ** TSRMLS_DC);
+       void            (*free_buffer)(struct st_mysqlnd_read_buffer ** TSRMLS_DC);
 } MYSQLND_READ_BUFFER;
 
 

diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c
index 77719f69a9b32221ca003e0d9b9b9c0e7ac07d56..b4a94b18e15e2a6fc330e70a7bf93cd5f0e77bfd 100644 (file)
--- a/ext/mysqlnd/mysqlnd_wireprotocol.c
+++ b/ext/mysqlnd/mysqlnd_wireprotocol.c
@@ -270,7 +270,7 @@ mysqlnd_create_read_buffer(size_t count TSRMLS_DC)
        ret->is_empty = php_mysqlnd_read_buffer_is_empty;
        ret->read = php_mysqlnd_read_buffer_read;
        ret->bytes_left = php_mysqlnd_read_buffer_bytes_left;
-       ret->free = php_mysqlnd_read_buffer_free;
+       ret->free_buffer = php_mysqlnd_read_buffer_free;
        ret->data = mnd_emalloc(count);
        ret->size = ret->len = count;
        ret->offset = 0;
@@ -680,7 +680,7 @@ mysqlnd_real_read(MYSQLND * conn, zend_uchar * buffer, size_t count TSRMLS_DC)
                        DBG_INF_FMT("left %u to read", to_read);
                        if (TRUE == net->uncompressed_data->is_empty(net->uncompressed_data)) {
                                /* Everything was consumed. This should never happen here, but for security */
-                               net->uncompressed_data->free(&net->uncompressed_data TSRMLS_CC);
+                               net->uncompressed_data->free_buffer(&net->uncompressed_data TSRMLS_CC);
                        }
                }
                if (to_read) {