diff options
| author | Andi Gutmans <andi@php.net> | 2000-03-26 16:00:35 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2000-03-26 16:00:35 +0000 |
| commit | b763b25c969286592e6e812c2b9001f915c37443 (patch) | |
| tree | 5caefd2d1c621064dd7cdc6ac51fd94dbbf88587 | |
| parent | 3b2bcf3c41ff868080e8ef90cf73af4552664422 (diff) | |
| download | php-git-b763b25c969286592e6e812c2b9001f915c37443.tar.gz | |
- Include Andrea's fix for alloca.h
| -rw-r--r-- | Zend/zend.h | 5 | ||||
| -rw-r--r-- | Zend/zend_opcode.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Zend/zend.h b/Zend/zend.h index c47c256292..23b3319039 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -83,11 +83,10 @@ # define ZEND_EXTENSIONS_SUPPORT 0 #endif -#if defined(HAVE_ALLOCA) && defined(HAVE_ALLOCA_H) +#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) +#if HAVE_ALLOCA_H # include <alloca.h> #endif - -#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) # define do_alloca(p) alloca(p) # define free_alloca(p) #else diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c index 74d42cfceb..96ac7952ec 100644 --- a/Zend/zend_opcode.c +++ b/Zend/zend_opcode.c @@ -76,7 +76,7 @@ void init_op_array(zend_op_array *op_array, int initial_ops_size) } #endif - op_array->refcount = (zend_uint *) emalloc(sizeof(int)); + op_array->refcount = (zend_uint *) emalloc(sizeof(zend_uint)); *op_array->refcount = 1; op_array->size = initial_ops_size; op_array->last = 0; |