diff options
| author | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
| commit | 4b943c9c0dd4114adc78416c5241f11ad5c98a80 (patch) | |
| tree | c9628d91eae3f580f9ebd73d2372e4c9089b2e00 /ext/gettext/gettext.c | |
| parent | 79354ba6d0d6a1a4596f9ac66ee9bc3a34ed972b (diff) | |
| parent | dec8eb431adee340fb8dfb9ff33ed29d3279c35f (diff) | |
| download | php-git-POST_NATIVE_TLS_MERGE.tar.gz | |
Merge remote-tracking branch 'origin/native-tls'POST_NATIVE_TLS_MERGE
Diffstat (limited to 'ext/gettext/gettext.c')
| -rw-r--r-- | ext/gettext/gettext.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ext/gettext/gettext.c b/ext/gettext/gettext.c index 938997a4a6..4554748643 100644 --- a/ext/gettext/gettext.c +++ b/ext/gettext/gettext.c @@ -140,13 +140,13 @@ ZEND_GET_MODULE(php_gettext) #define PHP_GETTEXT_DOMAIN_LENGTH_CHECK \ if (domain_len > PHP_GETTEXT_MAX_DOMAIN_LENGTH) { \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "domain passed too long"); \ + php_error_docref(NULL, E_WARNING, "domain passed too long"); \ RETURN_FALSE; \ } #define PHP_GETTEXT_LENGTH_CHECK(check_name, check_len) \ if (check_len > PHP_GETTEXT_MAX_MSGID_LENGTH) { \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s passed too long", check_name); \ + php_error_docref(NULL, E_WARNING, "%s passed too long", check_name); \ RETURN_FALSE; \ } @@ -164,7 +164,7 @@ PHP_NAMED_FUNCTION(zif_textdomain) char *domain, *domain_name, *retval; size_t domain_len; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &domain, &domain_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &domain, &domain_len) == FAILURE) { return; } @@ -189,7 +189,7 @@ PHP_NAMED_FUNCTION(zif_gettext) char *msgid, *msgstr; size_t msgid_len; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &msgid, &msgid_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &msgid, &msgid_len) == FAILURE) { return; } @@ -207,7 +207,7 @@ PHP_NAMED_FUNCTION(zif_dgettext) char *domain, *msgid, *msgstr; size_t domain_len, msgid_len; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &domain, &domain_len, &msgid, &msgid_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss", &domain, &domain_len, &msgid, &msgid_len) == FAILURE) { return; } @@ -228,7 +228,7 @@ PHP_NAMED_FUNCTION(zif_dcgettext) size_t domain_len, msgid_len; zend_long category; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ssl", &domain, &domain_len, &msgid, &msgid_len, &category) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "ssl", &domain, &domain_len, &msgid, &msgid_len, &category) == FAILURE) { return; } @@ -249,7 +249,7 @@ PHP_NAMED_FUNCTION(zif_bindtextdomain) size_t domain_len, dir_len; char *retval, dir_name[MAXPATHLEN]; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &domain, &domain_len, &dir, &dir_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss", &domain, &domain_len, &dir, &dir_len) == FAILURE) { return; } @@ -283,7 +283,7 @@ PHP_NAMED_FUNCTION(zif_ngettext) size_t msgid1_len, msgid2_len; zend_long count; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ssl", &msgid1, &msgid1_len, &msgid2, &msgid2_len, &count) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "ssl", &msgid1, &msgid1_len, &msgid2, &msgid2_len, &count) == FAILURE) { return; } @@ -307,7 +307,7 @@ PHP_NAMED_FUNCTION(zif_dngettext) size_t domain_len, msgid1_len, msgid2_len; zend_long count; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sssl", &domain, &domain_len, + if (zend_parse_parameters(ZEND_NUM_ARGS(), "sssl", &domain, &domain_len, &msgid1, &msgid1_len, &msgid2, &msgid2_len, &count) == FAILURE) { return; } @@ -335,7 +335,7 @@ PHP_NAMED_FUNCTION(zif_dcngettext) RETVAL_FALSE; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sssll", &domain, &domain_len, + if (zend_parse_parameters(ZEND_NUM_ARGS(), "sssll", &domain, &domain_len, &msgid1, &msgid1_len, &msgid2, &msgid2_len, &count, &category) == FAILURE) { return; } @@ -362,7 +362,7 @@ PHP_NAMED_FUNCTION(zif_bind_textdomain_codeset) char *domain, *codeset, *retval = NULL; size_t domain_len, codeset_len; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &domain, &domain_len, &codeset, &codeset_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss", &domain, &domain_len, &codeset, &codeset_len) == FAILURE) { return; } |