Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  fixed #endif comments
This commit is contained in:
Joe Watkins 2017-08-02 08:35:51 +01:00
commit 6202c821a9
No known key found for this signature in database
GPG Key ID: F9BA0ADA31CBD89E

View File

@ -769,7 +769,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;