ported ext/gettext

diff --git a/ext/gettext/gettext.c b/ext/gettext/gettext.c
index 1e07000c33ec0fa6bcde3cf1e988187a95463e8f..59b9661481b4c11e132e0a0c7c1057e51ec1436a 100644 (file)
--- a/ext/gettext/gettext.c
+++ b/ext/gettext/gettext.c
@@ -226,9 +226,9 @@ PHP_NAMED_FUNCTION(zif_dcgettext)
 {
        char *domain, *msgid, *msgstr;
        int domain_len, msgid_len;
-       long category;
+       php_int_t 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() TSRMLS_CC, "ssi", &domain, &domain_len, &msgid, &msgid_len, &category) == FAILURE) {
                return;
        }
 
@@ -281,9 +281,9 @@ PHP_NAMED_FUNCTION(zif_ngettext)
 {
        char *msgid1, *msgid2, *msgstr;
        int msgid1_len, msgid2_len;
-       long count;
+       php_int_t 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() TSRMLS_CC, "ssi", &msgid1, &msgid1_len, &msgid2, &msgid2_len, &count) == FAILURE) {
                return;
        }
 
@@ -305,9 +305,9 @@ PHP_NAMED_FUNCTION(zif_dngettext)
 {
        char *domain, *msgid1, *msgid2, *msgstr = NULL;
        int domain_len, msgid1_len, msgid2_len;
-       long count;
+       php_int_t count;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sssl", &domain, &domain_len,
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sssi", &domain, &domain_len,
                &msgid1, &msgid1_len, &msgid2, &msgid2_len, &count) == FAILURE) {
                return;
        }
@@ -331,11 +331,11 @@ PHP_NAMED_FUNCTION(zif_dcngettext)
 {
        char *domain, *msgid1, *msgid2, *msgstr = NULL;
        int domain_len, msgid1_len, msgid2_len;
-       long count, category;
+       php_int_t count, category;
 
        RETVAL_FALSE;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sssll", &domain, &domain_len,
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sssii", &domain, &domain_len,
                &msgid1, &msgid1_len, &msgid2, &msgid2_len, &count, &category) == FAILURE) {
                return;
        }