diff options
| author | Anatol Belski <ab@php.net> | 2014-12-12 12:05:47 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-12 12:05:47 +0100 |
| commit | c96ffaa653793c59fc398a79434cc3c5d598f724 (patch) | |
| tree | ecae8c7b6a2365476003fe58c3d29f05acddfc4b /Zend/zend_execute.h | |
| parent | 21da246807274df4ab04ca666a1069f4e1539a3b (diff) | |
| parent | 3affc0e8a2167fd5e31cf120f691f52d474e5f89 (diff) | |
| download | php-git-c96ffaa653793c59fc398a79434cc3c5d598f724.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #68583 Crash in timeout thread
Conflicts:
Zend/zend_execute.h
Diffstat (limited to 'Zend/zend_execute.h')
| -rw-r--r-- | Zend/zend_execute.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h index 9bde312e53..346147e472 100644 --- a/Zend/zend_execute.h +++ b/Zend/zend_execute.h @@ -364,13 +364,6 @@ void zend_verify_abstract_class(zend_class_entry *ce TSRMLS_DC); ZEND_API void zend_fetch_dimension_by_zval(zval **result, zval *container, zval *dim TSRMLS_DC); -#ifdef ZEND_WIN32 -void zend_init_timeout_thread(void); -void zend_shutdown_timeout_thread(void); -#define WM_REGISTER_ZEND_TIMEOUT (WM_USER+1) -#define WM_UNREGISTER_ZEND_TIMEOUT (WM_USER+2) -#endif - #define zendi_zval_copy_ctor(p) zval_copy_ctor(&(p)) #define zendi_zval_dtor(p) zval_dtor(&(p)) |