kalle                                    Mon, 27 Jul 2009 07:14:40 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=286386

Log:
Fixed bug #48872 (string.c: errors: duplicate case values) (Only in PHP_5_3)

Bug: http://bugs.php.net/48872 (Assigned) string.c: errors: duplicate case 
values
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/NEWS
    U   php/php-src/branches/PHP_5_3/ext/standard/string.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS   2009-07-27 03:43:38 UTC (rev 286385)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-07-27 07:14:40 UTC (rev 286386)
@@ -1,4 +1,4 @@
-PHP                                                                        NEWS
+´╗┐PHP                                                                        
NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2009, PHP 5.3.1
 - Fixed spl_autoload_unregister/spl_autoload_functions wrt. Closures and
@@ -30,6 +30,7 @@
 - Fixed bug #48899 (is_callable returns true even if method does not exist in
   parent class). (Felipe)
 - Fixed bug #48893 (Problems compiling with Curl). (Felipe)
+- Fixed bug #48872 (string.c: errors: duplicate case values). (Kalle)
 - Fixed bug #48854 (array_merge_recursive modifies arrays after first one).
   (Felipe)
 - Fixed bug #48802 (printf() returns incorrect outputted length). (Jani)

Modified: php/php-src/branches/PHP_5_3/ext/standard/string.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/string.c  2009-07-27 03:43:38 UTC 
(rev 286385)
+++ php/php-src/branches/PHP_5_3/ext/standard/string.c  2009-07-27 07:14:40 UTC 
(rev 286386)
@@ -587,14 +587,12 @@
 #endif
 #ifdef DECIMAL_POINT
                case DECIMAL_POINT:
-#endif
-#ifdef RADIXCHAR
+#elif defined(RADIXCHAR)
                case RADIXCHAR:
 #endif
 #ifdef THOUSANDS_SEP
                case THOUSANDS_SEP:
-#endif
-#ifdef THOUSEP
+#elif defined(THOUSEP)
                case THOUSEP:
 #endif
 #ifdef GROUPING

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to