Fix build

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index ffaf67a73a08de84f629acb2df54fe37392806ed..1ad1b5e1524fabb2467fcf25319b694a6a1c0741 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -2426,7 +2426,7 @@ static void do_inherit_parent_constructor(zend_class_entry *ce TSRMLS_DC) /* {{{
                                if (function->common.fn_flags & ZEND_ACC_CTOR) {
                                        /* inherit parent's constructor */
                                        zend_u_hash_update(&ce->function_table, ZEND_STR_TYPE, lc_parent_class_name, ce->parent->name_length+1, function, sizeof(zend_function), NULL);
-                                       function_add_ref(function);
+                                       function_add_ref(function TSRMLS_CC);
                                }
                        }
                        efree(lc_parent_class_name.v);

diff --git a/ext/standard/exec.c b/ext/standard/exec.c
index 78521eefbde48247a1d4a752ec856bb6d95f785f..95116ff32073664421c1fe9b8b474061f20344f1 100644 (file)
--- a/ext/standard/exec.c
+++ b/ext/standard/exec.c
@@ -24,6 +24,7 @@
 #include "php_string.h"
 #include "ext/standard/head.h"
 #include "ext/standard/file.h"
+#include "basic_functions.h"
 #include "exec.h"
 #include "php_globals.h"
 #include "SAPI.h"
@@ -252,6 +253,8 @@ PHPAPI char *php_escape_shell_cmd(char *str)
        char *cmd;
        char *p = NULL;
        size_t estimate = (2 * l) + 1;
+       
+       TSRMLS_FETCH();
 
        cmd = safe_emalloc(2, l, 1);