diff options
| author | Dmitry Stogov <dmitry@php.net> | 2010-07-08 07:38:59 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2010-07-08 07:38:59 +0000 |
| commit | df8bf2a2de49b62265abdb412a9d96a41498884a (patch) | |
| tree | 6587471e9f4a27549521b893f86942f0392aa041 /ext/mysqlnd/php_mysqlnd.c | |
| parent | c0c5c1ad4ce2336546e9454f69a0084ca206d879 (diff) | |
| download | php-git-df8bf2a2de49b62265abdb412a9d96a41498884a.tar.gz | |
Fixed checks for PHP_DEBUG macro
Diffstat (limited to 'ext/mysqlnd/php_mysqlnd.c')
| -rw-r--r-- | ext/mysqlnd/php_mysqlnd.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/ext/mysqlnd/php_mysqlnd.c b/ext/mysqlnd/php_mysqlnd.c index b16b7fc092..a084079f06 100644 --- a/ext/mysqlnd/php_mysqlnd.c +++ b/ext/mysqlnd/php_mysqlnd.c @@ -185,7 +185,7 @@ PHP_INI_BEGIN() STD_PHP_INI_ENTRY("mysqlnd.log_mask", "0", PHP_INI_ALL, OnUpdateLong, log_mask, zend_mysqlnd_globals, mysqlnd_globals) STD_PHP_INI_ENTRY("mysqlnd.mempool_default_size","16000", PHP_INI_ALL, OnUpdateLong, mempool_default_size, zend_mysqlnd_globals, mysqlnd_globals) -#ifdef PHP_DEBUG +#if PHP_DEBUG STD_PHP_INI_ENTRY("mysqlnd.debug_emalloc_fail_threshold","-1", PHP_INI_SYSTEM, OnUpdateLong, debug_emalloc_fail_threshold, zend_mysqlnd_globals, mysqlnd_globals) STD_PHP_INI_ENTRY("mysqlnd.debug_ecalloc_fail_threshold","-1", PHP_INI_SYSTEM, OnUpdateLong, debug_ecalloc_fail_threshold, zend_mysqlnd_globals, mysqlnd_globals) STD_PHP_INI_ENTRY("mysqlnd.debug_erealloc_fail_threshold","-1", PHP_INI_SYSTEM, OnUpdateLong, debug_erealloc_fail_threshold, zend_mysqlnd_globals, mysqlnd_globals) @@ -222,12 +222,11 @@ static PHP_MSHUTDOWN_FUNCTION(mysqlnd) /* }}} */ -#if defined(PHP_DEBUG) +#if PHP_DEBUG /* {{{ PHP_RINIT_FUNCTION */ static PHP_RINIT_FUNCTION(mysqlnd) { -#if defined(PHP_DEBUG) if (MYSQLND_G(debug)) { MYSQLND_DEBUG *dbg = mysqlnd_debug_init(mysqlnd_debug_std_no_trace_funcs TSRMLS_CC); if (!dbg) { @@ -236,14 +235,13 @@ static PHP_RINIT_FUNCTION(mysqlnd) dbg->m->set_mode(dbg, MYSQLND_G(debug)); MYSQLND_G(dbg) = dbg; } -#endif return SUCCESS; } /* }}} */ #endif -#if defined(PHP_DEBUG) +#if PHP_DEBUG /* {{{ PHP_RSHUTDOWN_FUNCTION */ static PHP_RSHUTDOWN_FUNCTION(mysqlnd) @@ -277,12 +275,12 @@ zend_module_entry mysqlnd_module_entry = { mysqlnd_functions, PHP_MINIT(mysqlnd), PHP_MSHUTDOWN(mysqlnd), -#if defined(PHP_DEBUG) +#if PHP_DEBUG PHP_RINIT(mysqlnd), #else NULL, #endif -#ifdef PHP_DEBUG +#if PHP_DEBUG PHP_RSHUTDOWN(mysqlnd), #else NULL, |