Re: cvs: php-src /ext/gettext gettext.c
| From: | Jani Taskinen | Date: | Mon, 03 Nov 2008 12:25:26 +0000 |
| Subject: | Re: cvs: php-src /ext/gettext gettext.c | ||
| References: | 1 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-53851@lists.php.net to get a copy of this message | ||
Antony Dovgal wrote:
tony2001 Sun Nov 2 21:06:47 2008 UTCWhatta hell...okay, so I didn't test compile with HEAD. I'm very sowwy..won't happen again for a while. :D --JaniModified files: /php-src/ext/gettext gettext.c Log:fix build http://cvs.php.net/viewvc.cgi/php-src/ext/gettext/gettext.c?r1=1.61&r2=1.62&diff_format=u Index: php-src/ext/gettext/gettext.c diff -u php-src/ext/gettext/gettext.c:1.61 php-src/ext/gettext/gettext.c:1.62 --- php-src/ext/gettext/gettext.c:1.61 Sat Nov 1 23:08:52 2008 +++ php-src/ext/gettext/gettext.c Sun Nov 2 21:06:46 2008 @@ -16,7 +16,7 @@+----------------------------------------------------------------------+*/ -/* $Id: gettext.c,v 1.61 2008/11/01 23:08:52 jani Exp $ */ +/* $Id: gettext.c,v 1.62 2008/11/02 21:06:46 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -274,10 +274,10 @@ PHP_NAMED_FUNCTION(zif_ngettext) { char *msgid_str1, *msgid_str2, *msgstr; - int msgid_len1, msgid_len2; + int msgid1_len, msgid2_len; long count; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s&s&l", &msgid_str1, &msgid_len1, UG(ascii_conv), &msgid_str2, &msgid_len2, UG(ascii_conv), &count)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s&s&l", &msgid_str1, &msgid1_len, UG(ascii_conv), &msgid_str2, &msgid2_len, UG(ascii_conv), &count)) { RETURN_FALSE; } @@ -299,10 +299,10 @@ PHP_NAMED_FUNCTION(zif_dngettext) { char *domain_str, *msgid_str1, *msgid_str2, *msgstr; - int domain_len, msgid_len1, msgid_len2; + int domain_len, msgid1_len, msgid2_len; long count; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s&s&s&l", &domain_str, &domain_len, ZEND_U_CONVERTER(UG(filesystem_encoding_conv)), &msgid_str1, &msgid_len1, UG(ascii_conv), &msgid_str2, &msgid_len2, UG(ascii_conv), &count)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s&s&s&l", &domain_str, &domain_len, ZEND_U_CONVERTER(UG(filesystem_encoding_conv)), &msgid_str1, &msgid1_len, UG(ascii_conv), &msgid_str2, &msgid2_len, UG(ascii_conv), &count)) { RETURN_FALSE; } @@ -325,10 +325,10 @@ PHP_NAMED_FUNCTION(zif_dcngettext) { char *domain_str, *msgid_str1, *msgid_str2, *msgstr; - int domain_len, msgid_len1, msgid_len2; + int domain_len, msgid1_len, msgid2_len; long count, category; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s&s&s&ll", &domain_str, &domain_len, ZEND_U_CONVERTER(UG(filesystem_encoding_conv)), &msgid_str1, &msgid_len1, UG(ascii_conv), &msgid_str2, &msgid_len2, UG(ascii_conv), &count, &category)) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s&s&s&ll", &domain_str, &domain_len, ZEND_U_CONVERTER(UG(filesystem_encoding_conv)), &msgid_str1, &msgid1_len, UG(ascii_conv), &msgid_str2, &msgid2_len, UG(ascii_conv), &count, &category)) { RETURN_FALSE; }