diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/standard/basic_functions.c | 4 | ||||
| -rw-r--r-- | ext/standard/php_var.h | 2 | ||||
| -rw-r--r-- | ext/standard/var.c | 3 |
3 files changed, 1 insertions, 8 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 3bb2c8f9c3..68fdafb64f 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -3067,7 +3067,6 @@ ZEND_BEGIN_ARG_INFO(arginfo_unserialize, 0) ZEND_ARG_INFO(0, variable_representation) ZEND_END_ARG_INFO() -#if MEMORY_LIMIT static ZEND_BEGIN_ARG_INFO_EX(arginfo_memory_get_usage, 0, 0, 0) ZEND_ARG_INFO(0, real_usage) @@ -3077,7 +3076,6 @@ static ZEND_BEGIN_ARG_INFO_EX(arginfo_memory_get_peak_usage, 0, 0, 0) ZEND_ARG_INFO(0, real_usage) ZEND_END_ARG_INFO() -#endif /* }}} */ /* {{{ versioning.c */ static @@ -3390,10 +3388,8 @@ zend_function_entry basic_functions[] = { PHP_FE(var_export, arginfo_var_export) PHP_FE(debug_zval_dump, arginfo_debug_zval_dump) PHP_FE(print_r, arginfo_print_r) -#if MEMORY_LIMIT PHP_FE(memory_get_usage, arginfo_memory_get_usage) PHP_FE(memory_get_peak_usage, arginfo_memory_get_peak_usage) -#endif PHP_FE(register_shutdown_function, arginfo_register_shutdown_function) PHP_FE(register_tick_function, arginfo_register_tick_function) diff --git a/ext/standard/php_var.h b/ext/standard/php_var.h index 42f1be5c21..dc699bdb9d 100644 --- a/ext/standard/php_var.h +++ b/ext/standard/php_var.h @@ -28,10 +28,8 @@ PHP_FUNCTION(var_export); PHP_FUNCTION(debug_zval_dump); PHP_FUNCTION(serialize); PHP_FUNCTION(unserialize); -#if MEMORY_LIMIT PHP_FUNCTION(memory_get_usage); PHP_FUNCTION(memory_get_peak_usage); -#endif PHPAPI void php_var_dump(zval **struc, int level TSRMLS_DC); PHPAPI void php_var_export(zval **struc, int level TSRMLS_DC); diff --git a/ext/standard/var.c b/ext/standard/var.c index e71558cd93..64be6260c2 100644 --- a/ext/standard/var.c +++ b/ext/standard/var.c @@ -910,7 +910,6 @@ PHP_FUNCTION(unserialize) /* }}} */ -#if MEMORY_LIMIT /* {{{ proto int memory_get_usage([real_usage]) Returns the allocated by PHP memory */ PHP_FUNCTION(memory_get_usage) { @@ -923,6 +922,7 @@ PHP_FUNCTION(memory_get_usage) { RETURN_LONG(zend_memory_usage(real_usage TSRMLS_CC)); } /* }}} */ + /* {{{ proto int memory_get_peak_usage([real_usage]) Returns the peak allocated by PHP memory */ PHP_FUNCTION(memory_get_peak_usage) { @@ -935,7 +935,6 @@ PHP_FUNCTION(memory_get_peak_usage) { RETURN_LONG(zend_memory_peak_usage(real_usage TSRMLS_CC)); } /* }}} */ -#endif /* * Local variables: |