diff options
| author | Remi Collet <remi@php.net> | 2017-01-20 17:50:09 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2017-01-20 17:50:09 +0100 |
| commit | fa45f64bd87b62f655e6d99c1a088efa5772b5fe (patch) | |
| tree | c66a0cb61accd1347639c2e4888c5868d7a851c7 /Zend/zend.h | |
| parent | 1f7bf2bfd63d94ddf4e28f903c692850232ef798 (diff) | |
| parent | d6c9f91e2ef0e4278a17c0c242790f5f4433be3e (diff) | |
| download | php-git-fa45f64bd87b62f655e6d99c1a088efa5772b5fe.tar.gz | |
Merge branch 'PHP-7.1'
* PHP-7.1:
NEWS
NEWS
Fixed bug #73965 DTrace reported as enabled when disabled
Diffstat (limited to 'Zend/zend.h')
| -rw-r--r-- | Zend/zend.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Zend/zend.h b/Zend/zend.h index 04409c23c4..bf4a6629a3 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -285,6 +285,8 @@ extern ZEND_API zend_class_entry *zend_standard_class_def; extern ZEND_API zend_utility_values zend_uv; extern ZEND_API zval zval_used_for_init; +/* If DTrace is available and enabled */ +extern ZEND_API zend_bool zend_dtrace_enabled; END_EXTERN_C() #define ZEND_UV(name) (zend_uv.name) |