cvs: php-src / configure.in /ext/standard info.c ZendEngine2 zend_alloc.h

derick Tue Jun 7 09:36:09 2005 EDT Modified files: /php-src configure.in /ZendEngine2 zend_alloc.h /php-src/ext/standard info.c Log: - Added the --disable-zend-memory-manager switch to disable the Zend memory manager. #- I discussed this with Dmitry today - we found it useful. http://cvs.php.net/diff.php/php-src/configure.in?r1=1.557&r2=1.558&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.557 php-src/configure.in:1.558 --- php-src/configure.in:1.557 Thu Jun 2 17:29:24 2005 +++ php-src/configure.in Tue Jun 7 09:36:06 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.557 2005/06/02 21:29:24 sniper Exp $ -*- autoconf -*- +dnl ## $Id: configure.in,v 1.558 2005/06/07 13:36:06 derick Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -623,6 +623,16 @@ ZEND_DEBUG=no fi +PHP_ARG_ENABLE(zend-memory-manager,whether to enable the Zend memory manager, +[ --disable-zend-memory-manager + Disable the Zend memory manager (DEVELOPERS ONLY)],yes, no) + +if test "$PHP_ZEND_MEMORY_MANAGER" = "yes"; then + AC_DEFINE(USE_ZEND_ALLOC, 1, [ ]) +else + AC_DEFINE(USE_ZEND_ALLOC, 0, [ ]) +fi + PHP_ARG_WITH(layout,[layout of installed files], [ --with-layout=TYPE Set how installed files will be laid out. Type is one of "PHP" or "GNU" [TYPE=PHP]], PHP, no) http://cvs.php.net/diff.php/ZendEngine2/zend_alloc.h?r1=1.61&r2=1.62&ty=u Index: ZendEngine2/zend_alloc.h diff -u ZendEngine2/zend_alloc.h:1.61 ZendEngine2/zend_alloc.h:1.62 --- ZendEngine2/zend_alloc.h:1.61 Thu Apr 7 16:15:21 2005 +++ ZendEngine2/zend_alloc.h Tue Jun 7 09:36:08 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_alloc.h,v 1.61 2005/04/07 20:15:21 sniper Exp $ */ +/* $Id: zend_alloc.h,v 1.62 2005/06/07 13:36:08 derick Exp $ */ #ifndef ZEND_ALLOC_H #define ZEND_ALLOC_H @@ -85,8 +85,6 @@ ZEND_API char *_estrdup(const char *s ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_MALLOC; ZEND_API char *_estrndup(const char *s, unsigned int length ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_MALLOC; -#define USE_ZEND_ALLOC 1 - #if USE_ZEND_ALLOC /* Standard wrapper macros */ http://cvs.php.net/diff.php/php-src/ext/standard/info.c?r1=1.247&r2=1.248&ty=u Index: php-src/ext/standard/info.c diff -u php-src/ext/standard/info.c:1.247 php-src/ext/standard/info.c:1.248 --- php-src/ext/standard/info.c:1.247 Sun May 8 13:24:38 2005 +++ php-src/ext/standard/info.c Tue Jun 7 09:36:08 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: info.c,v 1.247 2005/05/08 17:24:38 rasmus Exp $ */ +/* $Id: info.c,v 1.248 2005/06/07 13:36:08 derick Exp $ */ #include "php.h" #include "php_ini.h" @@ -469,6 +469,12 @@ php_info_print_table_row(2, "Thread Safety", "disabled" ); #endif +#if USE_ZEND_ALLOC + php_info_print_table_row(2, "Zend Memory Manager", "enabled" ); +#else + php_info_print_table_row(2, "Zend Memory Manager", "disabled" ); +#endif + #if HAVE_IPV6 php_info_print_table_row(2, "IPv6 Support", "enabled" ); #else