diff options
| author | Christopher Jones <sixd@php.net> | 2014-08-29 08:48:56 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2014-08-29 08:48:56 -0700 |
| commit | e39cc57bbd2e41b8cd4df672bcab2cc459d972e1 (patch) | |
| tree | a6762c429b11cb327cc35824f1909e2cfc92fa0b /ext/mysqlnd/mysqlnd_debug.h | |
| parent | 88099a0a27b8c95cf665f6c932672d2b25d305c4 (diff) | |
| parent | 6fe0bdda9cd5f3d041d48f74b253fb01e142942d (diff) | |
| download | php-git-e39cc57bbd2e41b8cd4df672bcab2cc459d972e1.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
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 6f073b1489..fe91082175 100644 --- a/ext/mysqlnd/mysqlnd_debug.h +++ b/ext/mysqlnd/mysqlnd_debug.h @@ -124,7 +124,8 @@ PHPAPI MYSQLND_DEBUG * mysqlnd_debug_init(const char * skip_functions[] TSRMLS_D 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)) \ |