rrichards Wed Mar 1 11:19:35 2006 UTC
Modified files:
/php-src/ext/standard string.c
Log:
64-bit fixes - ("make test" now works again on these platforms)
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/string.c?r1=1.518&r2=1.519&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.518 php-src/ext/standard/string.c:1.519
--- php-src/ext/standard/string.c:1.518 Tue Feb 21 20:12:42 2006
+++ php-src/ext/standard/string.c Wed Mar 1 11:19:35 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.518 2006/02/21 20:12:42 dmitry Exp $ */
+/* $Id: string.c,v 1.519 2006/03/01 11:19:35 rrichards Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -1089,7 +1089,7 @@
void *str, *delim;
int str_len, delim_len;
zend_uchar str_type, delim_type;
- int limit = -1;
+ long limit = -1;
int argc = ZEND_NUM_ARGS();
if ( argc < 2 || argc > 3 ) {
@@ -2226,7 +2226,7 @@
int haystack_len;
zend_uchar haystack_type;
zval **needle;
- int offset = 0;
+ long offset = 0;
void *found = NULL;
char needle_char[2];
UChar u_needle_char[3];
@@ -2825,8 +2825,8 @@
int str_len;
int32_t cp_len;
zend_uchar str_type;
- int l = -1;
- int f;
+ long l = -1;
+ long f;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "tl|l", &str,
&str_len, &str_type, &f, &l) == FAILURE) {
return;
@@ -6148,9 +6148,9 @@
{
/* Input arguments */
void *input; /* Input string */
- int32_t pad_length; /* Length to pad to, in codepoints for Unicode
*/
+ long pad_length; /* Length to pad to, in codepoints for Unicode
*/
void *padstr; /* Padding string */
- int32_t pad_type; /* Padding type (left/right/both) */
+ long pad_type; /* Padding type (left/right/both) */
int input_len, padstr_len; /* Lengths in code units for Unicode */
zend_uchar input_type, padstr_type;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
