rasmus Fri, 07 Aug 2009 17:32:31 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=286916
Log:
Oops, true/false are not defined on Linux. They are on OSX.
Changed paths:
U php/php-src/branches/PHP_5_2/ext/standard/strnatcmp.c
U php/php-src/branches/PHP_5_3/ext/standard/strnatcmp.c
U php/php-src/trunk/ext/standard/strnatcmp.c
Modified: php/php-src/branches/PHP_5_2/ext/standard/strnatcmp.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/standard/strnatcmp.c 2009-08-07
17:14:19 UTC (rev 286915)
+++ php/php-src/branches/PHP_5_2/ext/standard/strnatcmp.c 2009-08-07
17:32:31 UTC (rev 286916)
@@ -105,7 +105,8 @@
char const *ap, *bp;
char const *aend = a + a_len,
*bend = b + b_len;
- int fractional, result, leading = true;
+ int fractional, result;
+ short leading = 1;
if (a_len == 0 || b_len == 0)
return a_len - b_len;
@@ -124,7 +125,7 @@
cb = *++bp;
}
- leading = false;
+ leading = 0;
/* process run of digits */
if (isdigit((int)(unsigned char)ca) && isdigit((int)(unsigned
char)cb)) {
Modified: php/php-src/branches/PHP_5_3/ext/standard/strnatcmp.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/strnatcmp.c 2009-08-07
17:14:19 UTC (rev 286915)
+++ php/php-src/branches/PHP_5_3/ext/standard/strnatcmp.c 2009-08-07
17:32:31 UTC (rev 286916)
@@ -105,7 +105,8 @@
char const *ap, *bp;
char const *aend = a + a_len,
*bend = b + b_len;
- int fractional, result, leading = true;
+ int fractional, result;
+ short leading = 1;
if (a_len == 0 || b_len == 0)
return a_len - b_len;
@@ -124,7 +125,7 @@
cb = *++bp;
}
- leading = false;
+ leading = 0;
/* process run of digits */
if (isdigit((int)(unsigned char)ca) && isdigit((int)(unsigned
char)cb)) {
Modified: php/php-src/trunk/ext/standard/strnatcmp.c
===================================================================
--- php/php-src/trunk/ext/standard/strnatcmp.c 2009-08-07 17:14:19 UTC (rev
286915)
+++ php/php-src/trunk/ext/standard/strnatcmp.c 2009-08-07 17:32:31 UTC (rev
286916)
@@ -105,7 +105,8 @@
{
unsigned char ca, cb;
unsigned int ai, bi;
- int fractional, result, leading = true;
+ int fractional, result;
+ short leading = 1;
ai = bi = 0;
while (1) {
@@ -120,7 +121,7 @@
cb = b[++bi];
}
- leading = false;
+ leading = 0;
/* process run of digits */
if (isdigit((int)(unsigned char)ca) && isdigit((int)(unsigned
char)cb)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
