diff options
| author | Christopher Jones <sixd@php.net> | 2014-08-29 08:48:43 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2014-08-29 08:48:43 -0700 |
| commit | 6fe0bdda9cd5f3d041d48f74b253fb01e142942d (patch) | |
| tree | b793c1e1cb51d6ae04e75d0896529a0eb4071532 /ext/mysqlnd/mysqlnd_debug.h | |
| parent | 13b45a36f073df212408d47a595b25ac494e5af2 (diff) | |
| parent | 9063188fadae0e576bf51a1fd20a268e65e2656a (diff) | |
| download | php-git-6fe0bdda9cd5f3d041d48f74b253fb01e142942d.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Remove 550+ compile warnings on OS X
Diffstat (limited to 'ext/mysqlnd/mysqlnd_debug.h')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_debug.h | 3 |
1 files changed, 2 insertions, 1 deletions
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)) \ |