rrichards Tue Jan 29 22:06:43 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mysqlnd mysqlnd_block_alloc.c mysqlnd_ps.c mysqlnd_result.c Log: MFH: fix win32 build http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_block_alloc.c?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/mysqlnd/mysqlnd_block_alloc.c diff -u php-src/ext/mysqlnd/mysqlnd_block_alloc.c:1.1.2.1 php-src/ext/mysqlnd/mysqlnd_block_alloc.c:1.1.2.2 --- php-src/ext/mysqlnd/mysqlnd_block_alloc.c:1.1.2.1 Mon Jan 28 22:50:06 2008 +++ php-src/ext/mysqlnd/mysqlnd_block_alloc.c Tue Jan 29 22:06:43 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mysqlnd_block_alloc.c,v 1.1.2.1 2008/01/28 22:50:06 andrey Exp $ */ +/* $Id: mysqlnd_block_alloc.c,v 1.1.2.2 2008/01/29 22:06:43 rrichards Exp $ */ #include "php.h" #include "mysqlnd.h" @@ -31,8 +31,8 @@ static void mysqlnd_mempool_free_contents(MYSQLND_MEMORY_POOL * pool TSRMLS_DC) { - DBG_ENTER("mysqlnd_mempool_dtor"); uint i; + DBG_ENTER("mysqlnd_mempool_dtor"); for (i = 0; i < pool->free_chunk_list_elements; i++) { MYSQLND_MEMORY_POOL_CHUNK * chunk = pool->free_chunk_list[i]; chunk->free_chunk(chunk, FALSE TSRMLS_CC); @@ -47,8 +47,8 @@ static void mysqlnd_mempool_free_chunk(MYSQLND_MEMORY_POOL_CHUNK * chunk, zend_bool cache_it TSRMLS_DC) { - DBG_ENTER("mysqlnd_mempool_free_chunk"); MYSQLND_MEMORY_POOL * pool = chunk->pool; + DBG_ENTER("mysqlnd_mempool_free_chunk"); if (chunk->from_pool) { /* Try to back-off and guess if this is the last block allocated */ if (chunk->ptr == (pool->arena + (pool->arena_size - pool->free_size - chunk->size))) { http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_ps.c?r1=1.3.2.8&r2=1.3.2.9&diff_format=u Index: php-src/ext/mysqlnd/mysqlnd_ps.c diff -u php-src/ext/mysqlnd/mysqlnd_ps.c:1.3.2.8 php-src/ext/mysqlnd/mysqlnd_ps.c:1.3.2.9 --- php-src/ext/mysqlnd/mysqlnd_ps.c:1.3.2.8 Mon Jan 28 22:50:06 2008 +++ php-src/ext/mysqlnd/mysqlnd_ps.c Tue Jan 29 22:06:43 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mysqlnd_ps.c,v 1.3.2.8 2008/01/28 22:50:06 andrey Exp $ */ +/* $Id: mysqlnd_ps.c,v 1.3.2.9 2008/01/29 22:06:43 rrichards Exp $ */ #include "php.h" #include "mysqlnd.h" #include "mysqlnd_wireprotocol.h" @@ -613,8 +613,8 @@ zval **current_row = set->data_cursor; if (NULL == current_row[0]) { - set->initialized_rows++; uint64 row_num = (set->data_cursor - set->data) / field_count; + set->initialized_rows++; result->m.row_decoder(set->row_buffers[row_num], current_row, result->meta->field_count, http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_result.c?r1=1.4.2.10&r2=1.4.2.11&diff_format=u Index: php-src/ext/mysqlnd/mysqlnd_result.c diff -u php-src/ext/mysqlnd/mysqlnd_result.c:1.4.2.10 php-src/ext/mysqlnd/mysqlnd_result.c:1.4.2.11 --- php-src/ext/mysqlnd/mysqlnd_result.c:1.4.2.10 Tue Jan 29 18:11:46 2008 +++ php-src/ext/mysqlnd/mysqlnd_result.c Tue Jan 29 22:06:43 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mysqlnd_result.c,v 1.4.2.10 2008/01/29 18:11:46 andrey Exp $ */ +/* $Id: mysqlnd_result.c,v 1.4.2.11 2008/01/29 22:06:43 rrichards Exp $ */ #include "php.h" #include "mysqlnd.h" #include "mysqlnd_wireprotocol.h" @@ -1005,8 +1005,8 @@ unsigned int i; if (NULL == current_row[0]) { - set->initialized_rows++; uint64 row_num = (set->data_cursor - set->data) / result->meta->field_count; + set->initialized_rows++; result->m.row_decoder(set->row_buffers[row_num], current_row, result->meta->field_count, @@ -1071,8 +1071,8 @@ struct mysqlnd_field_hash_key *zend_hash_key = result->meta->zend_hash_keys; if (NULL == current_row[0]) { - set->initialized_rows++; uint64 row_num = (set->data_cursor - set->data) / result->meta->field_count; + set->initialized_rows++; result->m.row_decoder(set->row_buffers[row_num], current_row, result->meta->field_count,
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php