com php-src: Remove 550+ compile warnings on OS X: ext/mysqlnd/ mysqlnd_debug.h
| From: | Christopher Jones | Date: | Fri, 29 Aug 2014 15:48:10 +0000 |
| Subject: | com php-src: Remove 550+ compile warnings on OS X: ext/mysqlnd/ mysqlnd_debug.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81301@lists.php.net to get a copy of this message | ||
Commit: 9063188fadae0e576bf51a1fd20a268e65e2656a
Author: Christopher Jones <sixd@php.net> Fri, 29 Aug 2014 08:48:10 -0700
Parents: e55c641792df2caf813b5df3272144974e4d8fc7
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9063188fadae0e576bf51a1fd20a268e65e2656a
Log:
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
Changed paths:
M ext/mysqlnd/mysqlnd_debug.h
Diff:
diff --git a/ext/mysqlnd/mysqlnd_debug.h b/ext/mysqlnd/mysqlnd_debug.h
index 8618513..ad904ac 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)) \