From: Andi Gutmans <andi@php.net>
Date: Sun, 26 Mar 2000 16:00:35 +0000 (+0000)
Subject: - Include Andrea's fix for alloca.h
X-Git-Tag: PHP-4.0-RC1~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b763b25c969286592e6e812c2b9001f915c37443;p=php

- Include Andrea's fix for alloca.h
---

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;