summaryrefslogtreecommitdiff
path: root/ext/standard
diff options
context:
space:
mode:
Diffstat (limited to 'ext/standard')
-rw-r--r--ext/standard/basic_functions.c5
-rw-r--r--ext/standard/filters.c16
-rw-r--r--ext/standard/streamsfuncs.c6
-rw-r--r--ext/standard/url_scanner_ex.c4
-rw-r--r--ext/standard/url_scanner_ex.re4
-rw-r--r--ext/standard/user_filters.c2
-rw-r--r--ext/standard/var_unserializer.c4
-rw-r--r--ext/standard/var_unserializer.re4
8 files changed, 22 insertions, 23 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 917a022079..bbad6bc7d7 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -4879,8 +4879,7 @@ static int user_shutdown_function_call(zval *zv) /* {{{ */
&shutdown_function_entry->arguments[0],
&retval,
shutdown_function_entry->arg_count - 1,
- shutdown_function_entry->arguments + 1
- TSRMLS_CC ) == SUCCESS)
+ shutdown_function_entry->arguments + 1) == SUCCESS)
{
zval_dtor(&retval);
}
@@ -4902,7 +4901,7 @@ static void user_tick_function_call(user_tick_function_entry *tick_fe) /* {{{ */
&retval,
tick_fe->arg_count - 1,
tick_fe->arguments + 1
- TSRMLS_CC) == SUCCESS) {
+ ) == SUCCESS) {
zval_dtor(&retval);
} else {
diff --git a/ext/standard/filters.c b/ext/standard/filters.c
index 1a74abf89c..912d2b1394 100644
--- a/ext/standard/filters.c
+++ b/ext/standard/filters.c
@@ -40,7 +40,7 @@ static php_stream_filter_status_t strfilter_rot13_filter(
php_stream_bucket_brigade *buckets_out,
size_t *bytes_consumed,
int flags
- TSRMLS_DC)
+ )
{
php_stream_bucket *bucket;
size_t consumed = 0;
@@ -88,7 +88,7 @@ static php_stream_filter_status_t strfilter_toupper_filter(
php_stream_bucket_brigade *buckets_out,
size_t *bytes_consumed,
int flags
- TSRMLS_DC)
+ )
{
php_stream_bucket *bucket;
size_t consumed = 0;
@@ -116,7 +116,7 @@ static php_stream_filter_status_t strfilter_tolower_filter(
php_stream_bucket_brigade *buckets_out,
size_t *bytes_consumed,
int flags
- TSRMLS_DC)
+ )
{
php_stream_bucket *bucket;
size_t consumed = 0;
@@ -207,7 +207,7 @@ static php_stream_filter_status_t strfilter_strip_tags_filter(
php_stream_bucket_brigade *buckets_out,
size_t *bytes_consumed,
int flags
- TSRMLS_DC)
+ )
{
php_stream_bucket *bucket;
size_t consumed = 0;
@@ -1726,7 +1726,7 @@ static php_stream_filter_status_t strfilter_convert_filter(
php_stream_bucket_brigade *buckets_out,
size_t *bytes_consumed,
int flags
- TSRMLS_DC)
+ )
{
php_stream_bucket *bucket = NULL;
size_t consumed = 0;
@@ -1845,7 +1845,7 @@ static php_stream_filter_status_t consumed_filter_filter(
php_stream_bucket_brigade *buckets_out,
size_t *bytes_consumed,
int flags
- TSRMLS_DC)
+ )
{
php_consumed_filter_data *data = (php_consumed_filter_data *)Z_PTR(thisfilter->abstract);
php_stream_bucket *bucket;
@@ -2058,7 +2058,7 @@ static php_stream_filter_status_t php_chunked_filter(
php_stream_bucket_brigade *buckets_out,
size_t *bytes_consumed,
int flags
- TSRMLS_DC)
+ )
{
php_stream_bucket *bucket;
size_t consumed = 0;
@@ -2144,7 +2144,7 @@ PHP_MINIT_FUNCTION(standard_filters)
if (FAILURE == php_stream_filter_register_factory(
standard_filters[i].ops->label,
standard_filters[i].factory
- TSRMLS_CC)) {
+ )) {
return FAILURE;
}
}
diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c
index 31ab31cf3f..3a28a2d576 100644
--- a/ext/standard/streamsfuncs.c
+++ b/ext/standard/streamsfuncs.c
@@ -272,7 +272,7 @@ PHP_FUNCTION(stream_socket_accept)
zpeername ? &peername : NULL,
NULL, NULL,
&tv, &errstr
- TSRMLS_CC) && clistream) {
+ ) && clistream) {
if (peername) {
ZVAL_STR(zpeername, peername);
@@ -307,7 +307,7 @@ PHP_FUNCTION(stream_socket_get_name)
if (0 != php_stream_xport_get_name(stream, want_peer,
&name,
NULL, NULL
- TSRMLS_CC)) {
+ )) {
RETURN_FALSE;
}
@@ -376,7 +376,7 @@ PHP_FUNCTION(stream_socket_recvfrom)
recvd = php_stream_xport_recvfrom(stream, read_buf->val, to_read, (int)flags, NULL, NULL,
zremote ? &remote_addr : NULL
- TSRMLS_CC);
+ );
if (recvd >= 0) {
if (zremote) {
diff --git a/ext/standard/url_scanner_ex.c b/ext/standard/url_scanner_ex.c
index 292d0a9315..a24fb1ee8b 100644
--- a/ext/standard/url_scanner_ex.c
+++ b/ext/standard/url_scanner_ex.c
@@ -252,8 +252,8 @@ enum {
#define YYMARKER q
#define STATE ctx->state
-#define STD_PARA url_adapt_state_ex_t *ctx, char *start, char *YYCURSOR TSRMLS_DC
-#define STD_ARGS ctx, start, xp TSRMLS_CC
+#define STD_PARA url_adapt_state_ex_t *ctx, char *start, char *YYCURSOR
+#define STD_ARGS ctx, start, xp
#if SCANNER_DEBUG
#define scdebug(x) printf x
diff --git a/ext/standard/url_scanner_ex.re b/ext/standard/url_scanner_ex.re
index 97611954f2..e374b76195 100644
--- a/ext/standard/url_scanner_ex.re
+++ b/ext/standard/url_scanner_ex.re
@@ -188,8 +188,8 @@ enum {
#define YYMARKER q
#define STATE ctx->state
-#define STD_PARA url_adapt_state_ex_t *ctx, char *start, char *YYCURSOR TSRMLS_DC
-#define STD_ARGS ctx, start, xp TSRMLS_CC
+#define STD_PARA url_adapt_state_ex_t *ctx, char *start, char *YYCURSOR
+#define STD_ARGS ctx, start, xp
#if SCANNER_DEBUG
#define scdebug(x) printf x
diff --git a/ext/standard/user_filters.c b/ext/standard/user_filters.c
index 9f748623c4..225381ffd5 100644
--- a/ext/standard/user_filters.c
+++ b/ext/standard/user_filters.c
@@ -169,7 +169,7 @@ php_stream_filter_status_t userfilter_filter(
php_stream_bucket_brigade *buckets_out,
size_t *bytes_consumed,
int flags
- TSRMLS_DC)
+ )
{
int ret = PSFS_ERR_FATAL;
zval *obj = &thisfilter->abstract;
diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
index f51a42095e..74a86ca5a7 100644
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@ -319,8 +319,8 @@ static inline size_t parse_uiv(const unsigned char *p)
return result;
}
-#define UNSERIALIZE_PARAMETER zval *rval, const unsigned char **p, const unsigned char *max, php_unserialize_data_t *var_hash, HashTable *classes TSRMLS_DC
-#define UNSERIALIZE_PASSTHRU rval, p, max, var_hash, classes TSRMLS_CC
+#define UNSERIALIZE_PARAMETER zval *rval, const unsigned char **p, const unsigned char *max, php_unserialize_data_t *var_hash, HashTable *classes
+#define UNSERIALIZE_PASSTHRU rval, p, max, var_hash, classes
static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, zend_long elements, int objprops)
{
diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re
index 99600995a5..dc72d7051b 100644
--- a/ext/standard/var_unserializer.re
+++ b/ext/standard/var_unserializer.re
@@ -323,8 +323,8 @@ static inline size_t parse_uiv(const unsigned char *p)
return result;
}
-#define UNSERIALIZE_PARAMETER zval *rval, const unsigned char **p, const unsigned char *max, php_unserialize_data_t *var_hash, HashTable *classes TSRMLS_DC
-#define UNSERIALIZE_PASSTHRU rval, p, max, var_hash, classes TSRMLS_CC
+#define UNSERIALIZE_PARAMETER zval *rval, const unsigned char **p, const unsigned char *max, php_unserialize_data_t *var_hash, HashTable *classes
+#define UNSERIALIZE_PASSTHRU rval, p, max, var_hash, classes
static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, zend_long elements, int objprops)
{
View Lorry Controller Status