From: Christopher Jones <sixd@php.net>
Date: Fri, 29 Aug 2014 15:48:10 +0000 (-0700)
Subject: Remove 550+ compile warnings on OS X
X-Git-Tag: PRE_PHP7_REMOVALS~193^2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9063188fadae0e576bf51a1fd20a268e65e2656a;p=php

Remove 550+ compile warnings on OS X

The warnings had the signature:
php-src/ext/mysqlnd/mysqlnd_debug.h:127:25: note: expanded from macro 'DBG_ENTER_EX2'
                          if (dbg_skip_trace); /* shut compiler's mouth */\
                                             ^
php-src/ext/mysqlnd/mysqlnd.c:114:2: note: put the semicolon on a separate line to silence this warning
---

diff --git a/ext/mysqlnd/mysqlnd_debug.h b/ext/mysqlnd/mysqlnd_debug.h
index 861851378b..ad904acf69 100644
--- a/ext/mysqlnd/mysqlnd_debug.h
+++ b/ext/mysqlnd/mysqlnd_debug.h
@@ -126,7 +126,8 @@ PHPAPI char * mysqlnd_get_backtrace(uint max_levels, size_t * length TSRMLS_DC);
 					if ((dbg_obj2)) { \
 						dbg_skip_trace |= !(dbg_obj2)->m->func_enter((dbg_obj2), __LINE__, __FILE__, func_name, strlen(func_name)); \
 					} \
-					if (dbg_skip_trace); /* shut compiler's mouth */\
+					if (dbg_skip_trace) \
+						/* EMPTY */ ; /* shut compiler's mouth */	\
 					do { \
 						if (((dbg_obj1) && (dbg_obj1)->flags & MYSQLND_DEBUG_PROFILE_CALLS) || \
 							((dbg_obj2) && (dbg_obj2)->flags & MYSQLND_DEBUG_PROFILE_CALLS)) \