Changeset 11918 in webkit for trunk/JavaScriptCore/pcre/pcre_exec.c

Timestamp:

Jan 6, 2006, 2:43:44 PM (19 years ago)

Author:

hyatt

Message:

Land all the changes to make JSCore build again on windows.

File:

• trunk/JavaScriptCore/pcre/pcre_exec.c (modified) (3 diffs)

trunk/JavaScriptCore/pcre/pcre_exec.c

@@ -1808 +1808 @@
       GETUTF8CHARLEN(fc, ecode, length);
 #if PCRE_UTF16
-      int dc;
-      ecode += length;
-      switch (md->end_subject - eptr)
-      {
-        case 0:
-          RRETURN(MATCH_NOMATCH);
-        case 1:
-          dc = *eptr++;
-          if (IS_LEADING_SURROGATE(dc))
+      {
+        int dc;
+        ecode += length;
+        switch (md->end_subject - eptr)
+        {
+          case 0:
             RRETURN(MATCH_NOMATCH);
-          break;
-        default:
-          GETCHARINC(dc, eptr);
-      }
-      if (fc != dc) RRETURN(MATCH_NOMATCH);
+          case 1:
+            dc = *eptr++;
+            if (IS_LEADING_SURROGATE(dc))
+              RRETURN(MATCH_NOMATCH);
+            break;
+          default:
+            GETCHARINC(dc, eptr);
+        }
+        if (fc != dc) RRETURN(MATCH_NOMATCH);
+     }  
 #else
       if (length > md->end_subject - eptr) RRETURN(MATCH_NOMATCH);
@@ -1946 +1948 @@
 #ifdef SUPPORT_UTF8
 #if PCRE_UTF16
-      length = 1;
+
+          length = 1;
       GETUTF8CHARLEN(fc, ecode, length);
+          {
       int utf16Length; // don't initialize on this line as workaround for Win32 compile problem
       utf16Length = fc > 0xFFFF ? 2 : 1;
@@ -2051 +2055 @@
         }
         /* Control never gets here */
+          }
 #else
     if (utf8)