Changeset 18525 in webkit for trunk/JavaScriptCore

Timestamp:

Jan 2, 2007, 9:22:59 AM (18 years ago)

Author:

ddkilzer

Message:

JavaScriptCore:

Reviewed by NOBODY (Windows build fix).

The MSVC compiler requires variables to be declared at the top of the enclosing block in C source.

Disable this warning to prevent MSVC from complaining about the 'const pcre_uchar const *' type:
warning C4114: same type qualifier used more than once

• pcre/pcre_compile.c: (pcre_compile2): Moved variable declarations to top of their respective enclosing blocks.
• pcre/pcre_internal.h: Added pragma to disable compiler warning.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• pcre/pcre_compile.c (modified) (3 diffs)
• pcre/pcre_internal.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-01-02  David Kilzer  <[email protected]>
+
+        Reviewed by NOBODY (Windows build fix).
+
+        The MSVC compiler requires variables to be declared at the top of the enclosing block in C source.
+
+        Disable this warning to prevent MSVC from complaining about the 'const pcre_uchar const *' type:
+        warning C4114: same type qualifier used more than once
+
+        * pcre/pcre_compile.c:
+        (pcre_compile2): Moved variable declarations to top of their respective enclosing blocks.
+        * pcre/pcre_internal.h: Added pragma to disable compiler warning.
+
 2007-01-01  Mitz Pettel  <[email protected]>
 

trunk/JavaScriptCore/pcre/pcre_compile.c

@@ -3956 +3956 @@
 const uschar *codestart;
 const pcre_uchar *ptr;
+const pcre_uchar const* patternEnd;
 compile_data compile_block;
 int brastack[BRASTACK_SIZE];
@@ -4046 +4047 @@
 
 ptr = (const pcre_uchar *)(pattern - 1);
-const pcre_uchar const* patternEnd = (const pcre_uchar *)(pattern + patternLength);
+patternEnd = (const pcre_uchar *)(pattern + patternLength);
 
 while (++ptr < patternEnd)
   {
-  c = *ptr;
-  
   int min, max;
   int class_optcount;
@@ -4057 +4056 @@
   int duplength;
 
+  c = *ptr;
+  
   /* If we are inside a \Q...\E sequence, all chars are literal */
 

trunk/JavaScriptCore/pcre/pcre_internal.h

@@ -58 +58 @@
 
 #if COMPILER(MSVC)
+#pragma warning(disable: 4114)
 #pragma warning(disable: 4232)
 #pragma warning(disable: 4244)