diff options
| author | Anatol Belski <ab@php.net> | 2014-12-12 13:26:17 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-12 13:26:17 +0100 |
| commit | f4311686cc2c7d07abce2b752b4e8597771c5b25 (patch) | |
| tree | a479b88e6f8d3c6ed094a6451b36c0e2189a3f87 /Zend/zend_execute.h | |
| parent | 5dbeb9e65eb01fb974cd88025a4054f4e51bdbf2 (diff) | |
| parent | b1709b8ff0ad3a4beb1b560301d886aa49946599 (diff) | |
| download | php-git-f4311686cc2c7d07abce2b752b4e8597771c5b25.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
Fixed bug #68583 Crash in timeout thread
Conflicts:
Zend/zend_execute.h
Zend/zend_execute_API.c
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 3eab9662db..a410f47edf 100644 --- a/Zend/zend_execute.h +++ b/Zend/zend_execute.h @@ -234,13 +234,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 - ZEND_API zval* zend_get_compiled_variable_value(const zend_execute_data *execute_data_ptr, uint32_t var); #define ZEND_USER_OPCODE_CONTINUE 0 /* execute next opcode */ |