Re: [ZEND-ENGINE-CVS] cvs: ZendEngine2 / zend.c
| From: | Thies C. Arntzen | Date: | Wed, 04 Jun 2003 12:52:17 +0000 |
| Subject: | Re: [ZEND-ENGINE-CVS] cvs: ZendEngine2 / zend.c | ||
| References: | 1 | Groups: | php.zend-engine.cvs |
| Request: | Send a blank email to php-zend-engine-cvs+get-1330@lists.php.net to get a copy of this message | ||
On Wed, Jun 04, 2003 at 09:09:47AM -0000, Stanislav Malyshev wrote:
> stas Wed Jun 4 05:09:47 2003 EDT
>
> Modified files:
> /ZendEngine2 zend.c
> Log:
> fix non-ZTS build
this really looks like one of the forbidden "vodoo fixes" to
me....
>
>
> Index: ZendEngine2/zend.c
> diff -u ZendEngine2/zend.c:1.234 ZendEngine2/zend.c:1.235
> --- ZendEngine2/zend.c:1.234 Wed Jun 4 04:52:43 2003
> +++ ZendEngine2/zend.c Wed Jun 4 05:09:47 2003
> @@ -17,7 +17,7 @@
> +----------------------------------------------------------------------+
> */
>
> -/* $Id: zend.c,v 1.234 2003/06/04 08:52:43 sebastian Exp $ */
> +/* $Id: zend.c,v 1.235 2003/06/04 09:09:47 stas Exp $ */
>
> #include "zend.h"
> #include "zend_extensions.h"
> @@ -37,7 +37,6 @@
> #else
> # define GLOBAL_FUNCTION_TABLE CG(function_table)
> # define GLOBAL_CLASS_TABLE CG(class_table)
> -# define GLOBAL_CONSTANTS_TABLE CG(zend_constants)
> # define GLOBAL_AUTO_GLOBALS_TABLE CG(auto_globals)
> #endif
>
> @@ -568,7 +567,9 @@
> GLOBAL_FUNCTION_TABLE = (HashTable *) malloc(sizeof(HashTable));
> GLOBAL_CLASS_TABLE = (HashTable *) malloc(sizeof(HashTable));
> GLOBAL_AUTO_GLOBALS_TABLE = (HashTable *) malloc(sizeof(HashTable));
> +#ifdef ZTS
> GLOBAL_CONSTANTS_TABLE = (HashTable *) malloc(sizeof(HashTable));
> +#endif
> zend_hash_init_ex(GLOBAL_FUNCTION_TABLE, 100, NULL, ZEND_FUNCTION_DTOR, 1, 0);
> zend_hash_init_ex(GLOBAL_CLASS_TABLE, 10, NULL, ZEND_CLASS_DTOR, 1, 0);
>
>
>
>
> --
> Zend Engine CVS Mailing List (http://cvs.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
--
Thies C. Arntzen - Looking for all sorts of freelance work - just ask..
http://www.amazon.de/exec/obidos/wishlist/AB9DY62QWDSZ