- revert the previous change, which was to a file that the Windows

          port does not even use

        * icu/unicode/utf16.h:



git-svn-id: svn://svn.chromium.org/blink/trunk@42654 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/WebCore/ChangeLog

+2009-04-18  Dan Bernstein  <mitz@apple.com>
+
+        - revert the previous change, which was to a file that the Windows
+          port does not even use
+
+        * icu/unicode/utf16.h:
+
 2009-04-18  Dan Bernstein  <mitz@apple.com>
 
         Reviewed by Geoffrey Garen.

third_party/WebKit/WebCore/icu/unicode/utf16.h

@@ -252,14 +252,12 @@
 #define U16_NEXT(s, i, length, c) { \
     (c)=(s)[(i)++]; \
     if(U16_IS_LEAD(c)) { \
-        if((i)<(length)) { \
-            uint16_t __c2=(s)[(i)]; \
-            if(U16_IS_TRAIL(__c2)) { \
+        uint16_t __c2; \
+        if((i)<(length) && U16_IS_TRAIL(__c2=(s)[(i)])) { \
             ++(i); \
             (c)=U16_GET_SUPPLEMENTARY((c), __c2); \
         } \
     } \
-    } \
 }
 
 /**
@@ -478,14 +476,12 @@
 #define U16_PREV(s, start, i, c) { \
     (c)=(s)[--(i)]; \
     if(U16_IS_TRAIL(c)) { \
-        if((i)>(start)) { \
-            uint16_t __c2=(s)[(i)-1]; \
-            if (U16_IS_LEAD(__c2)) { \
+        uint16_t __c2; \
+        if((i)>(start) && U16_IS_LEAD(__c2=(s)[(i)-1])) { \
             --(i); \
             (c)=U16_GET_SUPPLEMENTARY(__c2, (c)); \
         } \
     } \
-    } \
 }
 
 /**