diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-08-02 08:35:38 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-08-02 08:35:38 +0100 |
| commit | 9c6262f39bbda2a3ca17662ad2704df3ff4374c6 (patch) | |
| tree | f2d216db6babd854830e6ab0b14151515f192f82 /Zend/zend.c | |
| parent | f0d40286e760c0fe73435d553a737050b338c02f (diff) | |
| parent | b2934d2612a1d1d422010ff47c4a9d2a00ed83ee (diff) | |
| download | php-git-9c6262f39bbda2a3ca17662ad2704df3ff4374c6.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fixed #endif comments
Diffstat (limited to 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 5672c5c347..282ad018db 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -712,7 +712,7 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions) / zend_compile_file = compile_file; zend_execute_ex = execute_ex; zend_execute_internal = NULL; -#endif /* HAVE_SYS_SDT_H */ +#endif /* HAVE_DTRACE */ zend_compile_string = compile_string; zend_throw_exception_hook = NULL; |