diff options
| -rw-r--r-- | Zend/zend.h | 2 | ||||
| -rw-r--r-- | Zend/zend_alloc.c | 2 | ||||
| -rw-r--r-- | Zend/zend_extensions.h | 8 | ||||
| -rw-r--r-- | Zend/zend_variables.c | 2 | ||||
| -rw-r--r-- | Zend/zend_variables.h | 2 |
5 files changed, 5 insertions, 11 deletions
diff --git a/Zend/zend.h b/Zend/zend.h index a8f2104287..32b3de9c0d 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -47,7 +47,7 @@ #include "config.unix.h" #endif -#ifdef ZEND_DEBUG +#if ZEND_DEBUG #define ZEND_FILE_LINE_D char *__zend_filename, uint __zend_lineno #define ZEND_FILE_LINE_DC , ZEND_FILE_LINE_D #define ZEND_FILE_LINE_ORIG_D char *__zend_orig_filename, uint __zend_orig_lineno diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index 1f78882cc3..6fdbf96a09 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -326,7 +326,7 @@ ZEND_API void start_memory_manager(void) ZEND_API void shutdown_memory_manager(int silent, int clean_cache) { mem_header *p, *t; -#ifdef ZEND_DEBUG +#if ZEND_DEBUG int had_leaks=0; #endif ALS_FETCH(); diff --git a/Zend/zend_extensions.h b/Zend/zend_extensions.h index 8bd0d126d8..a6b9ff7c5b 100644 --- a/Zend/zend_extensions.h +++ b/Zend/zend_extensions.h @@ -78,15 +78,9 @@ ZEND_API int zend_get_resource_handle(); #define ZTS_V 0 #endif -#ifdef ZEND_DEBUG -#define ZEND_DEBUG_V 1 -#else -#define ZEND_DEBUG_V 0 -#endif - #define ZEND_EXTENSION() \ - ZEND_EXT_API zend_extension_version_info extension_version_info = { ZEND_EXTENSION_API_NO, "0.90", ZTS_V, ZEND_DEBUG_V } + ZEND_EXT_API zend_extension_version_info extension_version_info = { ZEND_EXTENSION_API_NO, "0.90", ZTS_V, ZEND_DEBUG } #define STANDARD_ZEND_EXTENSION_PROPERTIES NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -1 diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c index 1a54465cc3..ca81494d25 100644 --- a/Zend/zend_variables.c +++ b/Zend/zend_variables.c @@ -153,7 +153,7 @@ ZEND_API int zend_print_variable(zval *var) } -#ifdef ZEND_DEBUG +#if ZEND_DEBUG ZEND_API int _zval_copy_ctor_wrapper(zval *zvalue) { return zval_copy_ctor(zvalue); diff --git a/Zend/zend_variables.h b/Zend/zend_variables.h index cf1e83c4a9..cdfa1c4eca 100644 --- a/Zend/zend_variables.h +++ b/Zend/zend_variables.h @@ -32,7 +32,7 @@ ZEND_API int _zval_ptr_dtor(zval **zval_ptr ZEND_FILE_LINE_DC); #define zval_dtor(zvalue) _zval_dtor((zvalue) ZEND_FILE_LINE_CC) #define zval_ptr_dtor(zval_ptr) _zval_ptr_dtor((zval_ptr) ZEND_FILE_LINE_CC) -#ifdef ZEND_DEBUG +#if ZEND_DEBUG ZEND_API int _zval_copy_ctor_wrapper(zval *zvalue); ZEND_API int _zval_dtor_wrapper(zval *zvalue); ZEND_API int _zval_ptr_dtor_wrapper(zval **zval_ptr); |