tony2001 Fri Aug 3 14:31:28 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/main snprintf.c spprintf.c Log: 'I32' and 'I' support http://cvs.php.net/viewvc.cgi/php-src/main/snprintf.c?r1=1.37.2.4.2.13&r2=1.37.2.4.2.14&diff_format=u Index: php-src/main/snprintf.c diff -u php-src/main/snprintf.c:1.37.2.4.2.13 php-src/main/snprintf.c:1.37.2.4.2.14 --- php-src/main/snprintf.c:1.37.2.4.2.13 Mon Jun 25 08:39:10 2007 +++ php-src/main/snprintf.c Fri Aug 3 14:31:27 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: snprintf.c,v 1.37.2.4.2.13 2007/06/25 08:39:10 dmitry Exp $ */ +/* $Id: snprintf.c,v 1.37.2.4.2.14 2007/08/03 14:31:27 tony2001 Exp $ */ #include "php.h" @@ -716,7 +716,16 @@ modifier = LM_LONG_LONG; } else #endif - modifier = LM_LONG; + if (*fmt == '3' && *(fmt+1) == '2') { + fmt += 2; + modifier = LM_LONG; + } else { +#ifdef _WIN64 + modifier = LM_LONG_LONG; +#else + modifier = LM_LONG; +#endif + } break; case 'l': fmt++; http://cvs.php.net/viewvc.cgi/php-src/main/spprintf.c?r1=1.25.2.2.2.9&r2=1.25.2.2.2.10&diff_format=u Index: php-src/main/spprintf.c diff -u php-src/main/spprintf.c:1.25.2.2.2.9 php-src/main/spprintf.c:1.25.2.2.2.10 --- php-src/main/spprintf.c:1.25.2.2.2.9 Fri Aug 3 09:51:12 2007 +++ php-src/main/spprintf.c Fri Aug 3 14:31:28 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spprintf.c,v 1.25.2.2.2.9 2007/08/03 09:51:12 tony2001 Exp $ */ +/* $Id: spprintf.c,v 1.25.2.2.2.10 2007/08/03 14:31:28 tony2001 Exp $ */ /* This is the spprintf implementation. * It has emerged from apache snprintf. See original header: @@ -312,7 +312,16 @@ modifier = LM_LONG_LONG; } else #endif - modifier = LM_LONG; + if (*fmt == '3' && *(fmt+1) == '2') { + fmt += 2; + modifier = LM_LONG; + } else { +#ifdef _WIN64 + modifier = LM_LONG_LONG; +#else + modifier = LM_LONG; +#endif + } break; case 'l': fmt++;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php