diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2014-02-06 09:38:50 +0100 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2014-02-06 09:38:50 +0100 |
| commit | 45d2df5f119d17804ccf6068cbe1132e118579b2 (patch) | |
| tree | e3014245763e4290de480fad0b1142728314b965 /Zend/zend.c | |
| parent | b33060af82c648bb3971de9d8fe67e52781cbd7a (diff) | |
| parent | e5ded6e843fc43dde4b6c65405a1d3e2ae026eb4 (diff) | |
| download | php-git-broken-5.6-20140206.tar.gz | |
Merge branch 'datibbaw/pow-operator' into PHP-5.6broken-5.6-20140206
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 ce11631300..acbbcbebc7 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -52,7 +52,7 @@ ZEND_API FILE *(*zend_fopen)(const char *filename, char **opened_path TSRMLS_DC) ZEND_API int (*zend_stream_open_function)(const char *filename, zend_file_handle *handle TSRMLS_DC); ZEND_API void (*zend_block_interruptions)(void); ZEND_API void (*zend_unblock_interruptions)(void); -ZEND_API void (*zend_ticks_function)(int ticks); +ZEND_API void (*zend_ticks_function)(int ticks TSRMLS_DC); ZEND_API void (*zend_error_cb)(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args); int (*zend_vspprintf)(char **pbuf, size_t max_len, const char *format, va_list ap); ZEND_API char *(*zend_getenv)(char *name, size_t name_len TSRMLS_DC); |