From: Pierre Joye <pajoye@php.net>
Date: Mon, 30 Nov 2009 10:56:01 +0000 (+0000)
Subject: - void is NaN, you can't do math ops on void. Declarations go first. Fix TS build
X-Git-Tag: php-5.4.0alpha1~191^2~2324
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=80e5ef6fa59507b6733ed6a5b132c21e64158d06;p=php

- void is NaN, you can't do math ops on void. Declarations go first. Fix TS build
---

diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index 365068d60c..3d4b02677a 100644
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -2393,7 +2393,7 @@ PHPAPI void ** _mysqlnd_plugin_get_plugin_connection_data(const MYSQLND * conn,
 	if (!conn || plugin_id >= mysqlnd_plugin_count()) {
 		return NULL;
 	}
-	DBG_RETURN((void *)conn + sizeof(MYSQLND) + plugin_id * sizeof(void *));
+	DBG_RETURN((void *)(conn + sizeof(MYSQLND) + plugin_id * sizeof(void *)));
 }
 /* }}} */
 
diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c
index 82b396c674..a1877e38cb 100644
--- a/ext/mysqlnd/mysqlnd_result.c
+++ b/ext/mysqlnd/mysqlnd_result.c
@@ -2073,7 +2073,7 @@ PHPAPI void ** _mysqlnd_plugin_get_plugin_result_data(const MYSQLND_RES * result
 	if (!result || plugin_id >= mysqlnd_plugin_count()) {
 		return NULL;
 	}
-	DBG_RETURN((void *)result + sizeof(MYSQLND_RES) + plugin_id * sizeof(void *));
+	DBG_RETURN((void *)(result + sizeof(MYSQLND_RES) + plugin_id * sizeof(void *)));
 }
 /* }}} */
 
diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c
index b4a94b18e1..b6b4ede3a9 100644
--- a/ext/mysqlnd/mysqlnd_wireprotocol.c
+++ b/ext/mysqlnd/mysqlnd_wireprotocol.c
@@ -1307,8 +1307,8 @@ php_mysqlnd_rset_header_read(void *_packet, MYSQLND *conn TSRMLS_DC)
 static
 void php_mysqlnd_rset_header_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
 {
-	DBG_ENTER("php_mysqlnd_rset_header_free_mem");
 	php_mysql_packet_rset_header *p= (php_mysql_packet_rset_header *) _packet;
+	DBG_ENTER("php_mysqlnd_rset_header_free_mem");
 	if (p->info_or_local_file) {
 		mnd_efree(p->info_or_local_file);
 		p->info_or_local_file = NULL;