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

diff --git a/NEWS b/NEWS
index cfd07952135766f92689ae44a1a74e64eabed82d..4f12eeccfa47cab05f501bf563fbdea84932d60a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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 @@ PHP                                                                        NEWS
 - 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)

diff --git a/ext/standard/string.c b/ext/standard/string.c
index 1c772c043e7a99b3b13601ea98078157b3e04c9f..f5895e46a11671970bcc87d5bef32a0b9d195c4b 100644 (file)
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -587,14 +587,12 @@ PHP_FUNCTION(nl_langinfo)
 #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