- Include Andrea's fix for alloca.h

diff --git a/Zend/zend.h b/Zend/zend.h
index c47c2562926359186675b575a50c3656934b348e..23b33190394830ca4e8189a54222b00242113660 100644 (file)
--- 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 74d42cfceb063abbd6bdefa7e4d2315d28a04878..96ac7952ecb4b13fa1104d8288c1148b0685564e 100644 (file)
--- 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;