rrichards Tue Jan 29 22:06:16 2008 UTC
Modified files:
/php-src/ext/mysqlnd mysqlnd_block_alloc.c mysqlnd_ps.c
mysqlnd_result.c mysqlnd_structs.h
Log:
fix win32 build
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_block_alloc.c?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_block_alloc.c
diff -u php-src/ext/mysqlnd/mysqlnd_block_alloc.c:1.2
php-src/ext/mysqlnd/mysqlnd_block_alloc.c:1.3
--- php-src/ext/mysqlnd/mysqlnd_block_alloc.c:1.2 Mon Jan 28 22:54:21 2008
+++ php-src/ext/mysqlnd/mysqlnd_block_alloc.c Tue Jan 29 22:06:16 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd_block_alloc.c,v 1.2 2008/01/28 22:54:21 andrey Exp $ */
+/* $Id: mysqlnd_block_alloc.c,v 1.3 2008/01/29 22:06:16 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.10&r2=1.11&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_ps.c
diff -u php-src/ext/mysqlnd/mysqlnd_ps.c:1.10
php-src/ext/mysqlnd/mysqlnd_ps.c:1.11
--- php-src/ext/mysqlnd/mysqlnd_ps.c:1.10 Mon Jan 28 22:54:21 2008
+++ php-src/ext/mysqlnd/mysqlnd_ps.c Tue Jan 29 22:06:16 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd_ps.c,v 1.10 2008/01/28 22:54:21 andrey Exp $ */
+/* $Id: mysqlnd_ps.c,v 1.11 2008/01/29 22:06:16 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.14&r2=1.15&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_result.c
diff -u php-src/ext/mysqlnd/mysqlnd_result.c:1.14
php-src/ext/mysqlnd/mysqlnd_result.c:1.15
--- php-src/ext/mysqlnd/mysqlnd_result.c:1.14 Tue Jan 29 18:13:12 2008
+++ php-src/ext/mysqlnd/mysqlnd_result.c Tue Jan 29 22:06:16 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd_result.c,v 1.14 2008/01/29 18:13:12 andrey Exp $ */
+/* $Id: mysqlnd_result.c,v 1.15 2008/01/29 22:06:16 rrichards Exp $ */
#include "php.h"
#include "mysqlnd.h"
@@ -1006,8 +1006,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,
@@ -1072,8 +1072,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,
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_structs.h?r1=1.9&r2=1.10&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_structs.h
diff -u php-src/ext/mysqlnd/mysqlnd_structs.h:1.9
php-src/ext/mysqlnd/mysqlnd_structs.h:1.10
--- php-src/ext/mysqlnd/mysqlnd_structs.h:1.9 Mon Jan 28 22:54:21 2008
+++ php-src/ext/mysqlnd/mysqlnd_structs.h Tue Jan 29 22:06:16 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd_structs.h,v 1.9 2008/01/28 22:54:21 andrey Exp $ */
+/* $Id: mysqlnd_structs.h,v 1.10 2008/01/29 22:06:16 rrichards Exp $ */
#ifndef MYSQLND_STRUCTS_H
#define MYSQLND_STRUCTS_H
@@ -448,7 +448,7 @@
/* stats */
MYSQLND_STATS stats;
-#ifdef ZTS
+#ifdef MYSQLND_THREADED
MUTEX_T LOCK_state;
pthread_cond_t COND_work_done;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
