diff options
| author | Joe Watkins <krakjoe@php.net> | 2016-11-12 17:30:41 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2016-11-12 17:30:41 +0000 |
| commit | a2bc7cf9ca74c051bfd287c1b3d54c76945f10cc (patch) | |
| tree | b45a5d42d9d2ab47f9f06180e12ca973d289a3cc /ext/opcache | |
| parent | 6c0e1ca4fa31a860a363abecd6376d99edff8833 (diff) | |
| parent | 2104bea5d756dfa40b605a4a2765a3bc4637a76c (diff) | |
| download | php-git-a2bc7cf9ca74c051bfd287c1b3d54c76945f10cc.tar.gz | |
Merge branch 'master' of git.php.net:/php-src
Diffstat (limited to 'ext/opcache')
| -rw-r--r-- | ext/opcache/Optimizer/zend_func_info.c | 6 | ||||
| -rw-r--r-- | ext/opcache/Optimizer/zend_inference.c | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/ext/opcache/Optimizer/zend_func_info.c b/ext/opcache/Optimizer/zend_func_info.c index 51e20be56c..ce2c11dcda 100644 --- a/ext/opcache/Optimizer/zend_func_info.c +++ b/ext/opcache/Optimizer/zend_func_info.c @@ -575,7 +575,7 @@ static const func_info_t func_infos[] = { #ifdef HAVE_GETHOSTNAME F1("gethostname", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), #endif -#if defined(PHP_WIN32) || (HAVE_DNS_SEARCH_FUNC && !(defined(__BEOS__) || defined(NETWARE))) +#if defined(PHP_WIN32) || (HAVE_DNS_SEARCH_FUNC && !(defined(__BEOS__))) F0("dns_check_record", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), F0("checkdnsrr", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), # if defined(PHP_WIN32) || HAVE_FULL_DNS_FUNCS @@ -689,7 +689,7 @@ static const func_info_t func_infos[] = { F0("socket_set_timeout", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), #endif F1("socket_get_status", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ANY), -#if (!defined(__BEOS__) && !defined(NETWARE) && HAVE_REALPATH) || defined(ZTS) +#if (!defined(__BEOS__) && HAVE_REALPATH) || defined(ZTS) F1("realpath", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), #endif #ifdef HAVE_FNMATCH @@ -734,10 +734,8 @@ static const func_info_t func_infos[] = { F0("is_link", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), F1("stat", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_FALSE | MAY_BE_ARRAY_OF_TRUE | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_STRING), F1("lstat", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_FALSE | MAY_BE_ARRAY_OF_TRUE | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_STRING), -#ifndef NETWARE F0("chown", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), F0("chgrp", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), -#endif #if HAVE_LCHOWN F0("lchown", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), #endif diff --git a/ext/opcache/Optimizer/zend_inference.c b/ext/opcache/Optimizer/zend_inference.c index afae8a7959..953011d737 100644 --- a/ext/opcache/Optimizer/zend_inference.c +++ b/ext/opcache/Optimizer/zend_inference.c @@ -1824,7 +1824,7 @@ static void zend_infer_ranges_warmup(const zend_op_array *op_array, zend_ssa *ss int worklist_len = zend_bitset_len(ssa->vars_count); int j, n; zend_ssa_range tmp; - ALLOCA_FLAG(use_heap); + ALLOCA_FLAG(use_heap) zend_bitset worklist = do_alloca(sizeof(zend_ulong) * worklist_len * 2, use_heap); zend_bitset visited = worklist + worklist_len; #ifdef NEG_RANGE |