Remove 550+ compile warnings on OS X
authorChristopher Jones <sixd@php.net>
Fri, 29 Aug 2014 15:48:10 +0000 (08:48 -0700)
committerChristopher Jones <sixd@php.net>
Fri, 29 Aug 2014 15:48:10 +0000 (08:48 -0700)
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

ext/mysqlnd/mysqlnd_debug.h

index 861851378bfc7cf91101175b06e1c05a24e28c86..ad904acf6924fa2b2080864ed5943812b8379f91 100644 (file)
@@ -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)) \