Fixed compilation on Windows

diff --git a/Zend/zend.h b/Zend/zend.h
index 63c49b32c8f1726261dc190227455f813e59c810..a18dbec93447d902dc8206cb2ce215c1697180b3 100644 (file)
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -181,6 +181,8 @@ char *alloca ();
 # define ZEND_ALLOCA_MAX_SIZE (32 * 1024)
 # define ALLOCA_FLAG(name) \
        zend_bool name;
+# define SET_ALLOCA_FLAG(name) \
+       name = 1
 # define do_alloca_ex(size, limit, use_heap) \
        ((use_heap = (UNEXPECTED((size) > (limit)))) ? emalloc(size) : alloca(size))
 # define do_alloca(size, use_heap) \
@@ -189,6 +191,7 @@ char *alloca ();
        do { if (UNEXPECTED(use_heap)) efree(p); } while (0)
 #else
 # define ALLOCA_FLAG(name)
+# define SET_ALLOCA_FLAG(name)
 # define do_alloca(p, use_heap)                emalloc(p)
 # define free_alloca(p, use_heap)      efree(p)
 #endif

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 99a2bf4a37ab67fe3c82414a1054acb69e4d4580..b356357e10d1536cd6f459e79b1d03a72df1735c 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -48,7 +48,7 @@ ZEND_API void execute(zend_op_array *op_array TSRMLS_DC)
        if (EXPECTED(op_array->T < TEMP_VAR_STACK_LIMIT && op_array->last_var < TEMP_VAR_STACK_LIMIT)) {
                EX(CVs) = (zval***)do_alloca(sizeof(zval**) * op_array->last_var + sizeof(temp_variable) * op_array->T, EX(use_heap));
        } else {
-               EX(use_heap) = 1;
+               SET_ALLOCA_FLAG(EX(use_heap));
                EX(CVs) = (zval***)safe_emalloc(sizeof(temp_variable), op_array->T, sizeof(zval**) * op_array->last_var);
        }
        EX(Ts) = (temp_variable *)(EX(CVs) + op_array->last_var);

diff --git a/Zend/zend_vm_execute.skl b/Zend/zend_vm_execute.skl
index b4366b80ee1cbf4f5bc1286b7ea17624f358b20d..05ca0ca2251cf2d86e4b6f5a8fabffeef78fb40c 100644 (file)
--- a/Zend/zend_vm_execute.skl
+++ b/Zend/zend_vm_execute.skl
@@ -19,7 +19,7 @@ ZEND_API void {%EXECUTOR_NAME%}(zend_op_array *op_array TSRMLS_DC)
        if (EXPECTED(op_array->T < TEMP_VAR_STACK_LIMIT && op_array->last_var < TEMP_VAR_STACK_LIMIT)) {
                EX(CVs) = (zval***)do_alloca(sizeof(zval**) * op_array->last_var + sizeof(temp_variable) * op_array->T, EX(use_heap));
        } else {
-               EX(use_heap) = 1;
+               SET_ALLOCA_FLAG(EX(use_heap));
                EX(CVs) = (zval***)safe_emalloc(sizeof(temp_variable), op_array->T, sizeof(zval**) * op_array->last_var);
        }
        EX(Ts) = (temp_variable *)(EX(CVs) + op_array->last_var);