From: Pierre Joye <pajoye@php.net>
Date: Fri, 11 Dec 2009 16:35:42 +0000 (+0000)
Subject: - fix build, come on, it is not that hard to test before commit, is it?
X-Git-Tag: php-5.4.0alpha1~191^2~2237
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ab58199a9e948905e29d63be5cddbcc781fa5b4;p=php

- fix build, come on, it is not that hard to test before commit, is it?
---

diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c
index b9bf3b2de0..ab801cfccf 100644
--- a/ext/mysqlnd/mysqlnd_wireprotocol.c
+++ b/ext/mysqlnd/mysqlnd_wireprotocol.c
@@ -2319,8 +2319,10 @@ mysqlnd_net_init(zend_bool persistent TSRMLS_DC)
 void
 mysqlnd_net_free(MYSQLND_NET * net TSRMLS_DC)
 {
-	DBG_ENTER("mysqlnd_net_free");
 	zend_bool pers = net->persistent;
+
+	DBG_ENTER("mysqlnd_net_free");
+
 	if (net) {
 		if (net->cmd_buffer.buffer) {
 			DBG_INF("Freeing cmd buffer");
diff --git a/ext/pdo_mysql/php_pdo_mysql_int.h b/ext/pdo_mysql/php_pdo_mysql_int.h
index 5a9f28e837..76106f1b02 100755
--- a/ext/pdo_mysql/php_pdo_mysql_int.h
+++ b/ext/pdo_mysql/php_pdo_mysql_int.h
@@ -70,6 +70,12 @@ ZEND_BEGIN_MODULE_GLOBALS(pdo_mysql)
 	char          *debug; /* The actual string */
 	MYSQLND_DEBUG *dbg;	/* The DBG object */
 #endif
+#if defined(PHP_WIN32) && !PDO_DBG_ENABLED
+	/* dummy member so we get at least one member in the struct
+	 * and avoids build errors.
+	 */
+	void *dummymemmber;
+#endif
 ZEND_END_MODULE_GLOBALS(pdo_mysql)
 
 ZEND_EXTERN_MODULE_GLOBALS(pdo_mysql);