com php-src: backported ticks function signature: Zend/zend.c Zend/zend.h
| From: | Anatol Belski | Date: | Sat, 15 Feb 2014 19:51:14 +0000 |
| Subject: | com php-src: backported ticks function signature: Zend/zend.c Zend/zend.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76074@lists.php.net to get a copy of this message | ||
Commit: 4fc459e4240a506da3a617381e8c0a942b262da9
Author: Anatol Belski <ab@php.net> Sat, 15 Feb 2014 20:51:14 +0100
Parents: 23679f5a014f49bc1e20a715584cefa10c7b4878
Branches: str_size_and_int64_56_backport
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4fc459e4240a506da3a617381e8c0a942b262da9
Log:
backported ticks function signature
Changed paths:
M Zend/zend.c
M Zend/zend.h
Diff:
diff --git a/Zend/zend.c b/Zend/zend.c
index 56dead4..3f499ce 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 TSRMLS_DC);
+ZEND_API void (*zend_ticks_function)(int ticks);
ZEND_API void (*zend_error_cb)(int type, const char *error_filename, const zend_size_t
error_lineno, const char *format, va_list args);
zend_size_t (*zend_vspprintf)(char **pbuf, zend_size_t max_len, const char *format, va_list ap);
ZEND_API char *(*zend_getenv)(char *name, size_t name_len TSRMLS_DC);
diff --git a/Zend/zend.h b/Zend/zend.h
index 37023a5..2f6ea6d 100644
--- a/Zend/zend.h
+++ b/Zend/zend..h
@@ -550,7 +550,7 @@ typedef struct _zend_utility_functions {
void (*block_interruptions)(void);
void (*unblock_interruptions)(void);
int (*get_configuration_directive)(const char *name, zend_size_t name_length, zval *contents);
- void (*ticks_function)(int ticks TSRMLS_DC);
+ void (*ticks_function)(int ticks);
void (*on_timeout)(int seconds TSRMLS_DC);
int (*stream_open_function)(const char *filename, zend_file_handle *handle TSRMLS_DC);
zend_size_t (*vspprintf_function)(char **pbuf, zend_size_t max_len, const char *format, va_list
ap);
@@ -702,7 +702,7 @@ extern ZEND_API zend_write_func_t zend_write;
extern ZEND_API FILE *(*zend_fopen)(const char *filename, char **opened_path TSRMLS_DC);
extern ZEND_API void (*zend_block_interruptions)(void);
extern ZEND_API void (*zend_unblock_interruptions)(void);
-extern ZEND_API void (*zend_ticks_function)(int ticks TSRMLS_DC);
+extern ZEND_API void (*zend_ticks_function)(int ticks);
extern ZEND_API void (*zend_error_cb)(int type, const char *error_filename, const zend_size_t
error_lineno, const char *format, va_list args) ZEND_ATTRIBUTE_PTR_FORMAT(printf, 4, 0);
extern ZEND_API void (*zend_on_timeout)(int seconds TSRMLS_DC);
extern ZEND_API int (*zend_stream_open_function)(const char *filename, zend_file_handle *handle
TSRMLS_DC);