cvs: php-src(PHP_4_4) / configure.in /ext/standard info.c Zend zend_alloc.h

derick Tue Jun 7 09:37:34 2005 EDT Modified files: (Branch: PHP_4_4) /php-src configure.in /Zend zend_alloc.h /php-src/ext/standard info.c Log: - MFH: 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.396.2.164.2.1&r2=1.396.2.164.2.2&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.396.2.164.2.1 php-src/configure.in:1.396.2.164.2.2 --- php-src/configure.in:1.396.2.164.2.1 Mon Jun 6 05:23:55 2005 +++ php-src/configure.in Tue Jun 7 09:37:33 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.396.2.164.2.1 2005/06/06 09:23:55 derick Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.396.2.164.2.2 2005/06/07 13:37:33 derick Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -659,6 +659,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 Sets how installed files will be laid out. Type is one of "PHP" (default) or "GNU"], PHP, no) http://cvs.php.net/diff.php/Zend/zend_alloc.h?r1=1.39.4.10&r2=1.39.4.10.2.1&ty=u Index: Zend/zend_alloc.h diff -u Zend/zend_alloc.h:1.39.4.10 Zend/zend_alloc.h:1.39.4.10.2.1 --- Zend/zend_alloc.h:1.39.4.10 Thu Apr 7 16:54:33 2005 +++ Zend/zend_alloc.h Tue Jun 7 09:37:33 2005 @@ -80,8 +80,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.218.2.18&r2=1.218.2.18.2.1&ty=u Index: php-src/ext/standard/info.c diff -u php-src/ext/standard/info.c:1.218.2.18 php-src/ext/standard/info.c:1.218.2.18.2.1 --- php-src/ext/standard/info.c:1.218.2.18 Sun May 8 13:20:57 2005 +++ php-src/ext/standard/info.c Tue Jun 7 09:37:33 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: info.c,v 1.218.2.18 2005/05/08 17:20:57 rasmus Exp $ */ +/* $Id: info.c,v 1.218.2.18.2.1 2005/06/07 13:37:33 derick Exp $ */ #include "php.h" #include "php_ini.h" @@ -465,6 +465,12 @@ php_info_print_table_row(2, "Debug Build", "no" ); #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 + #ifdef ZTS php_info_print_table_row(2, "Thread Safety", "enabled" ); #else