Changeset 10798 in webkit for trunk/JavaScriptCore

Timestamp:

Oct 8, 2005, 9:25:00 PM (20 years ago)

Author:

darin

Message:

Reviewed, tweaked, and landed by Darin.

• fixed ​http://bugzilla.opendarwin.org/show_bug.cgi?id=5189 pcre_exec.c fails to compile using MSVC
• fixed ​http://bugzilla.opendarwin.org/show_bug.cgi?id=5190 KJS config.h adjustment for Win32

• kjs/config.h: Make sure HAVE_MMAP and HAVE_SBRK are off for Win32. Turn HAVE_ERRNO_H on for Mac OS X. Sort defines so they are easy to compare with each other. Remove #undef of DEBUG_COLLECTOR.
• pcre/pcre_exec.c: (match): Work around strange MSVC complaint by splitting the definition of a local variable into a separate declaration and initialization.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/config.h (modified) (3 diffs)
• pcre/pcre_exec.c (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2005-10-08  Justin Haygood  <[email protected]>
+
+        Reviewed, tweaked, and landed by Darin.
+
+        - fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=5189
+          pcre_exec.c fails to compile using MSVC
+        - fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=5190
+          KJS config.h adjustment for Win32
+        
+        * kjs/config.h: Make sure HAVE_MMAP and HAVE_SBRK are off for Win32.
+        Turn HAVE_ERRNO_H on for Mac OS X. Sort defines so they are easy to compare
+        with each other. Remove #undef of DEBUG_COLLECTOR.
+        * pcre/pcre_exec.c: (match): Work around strange MSVC complaint by splitting
+        the definition of a local variable into a separate declaration and
+        initialization.
+
 2005-10-05  Geoffrey Garen  <[email protected]>
  

trunk/JavaScriptCore/kjs/config.h

@@ -1 +1 @@
 #if __APPLE__
 
+#define HAVE_ERRNO_H 1
 #define HAVE_FUNC_ISINF 1
 #define HAVE_FUNC_ISNAN 1
+#define HAVE_MMAP 1
+#define HAVE_SBRK 1
 #define HAVE_STRINGS_H 1
 #define HAVE_SYS_PARAM_H 1
@@ -16 +19 @@
 #else
 
+#define HAVE_ERRNO_H 1
 #define HAVE_FUNC_ISINF 1
 #define HAVE_FUNC_ISNAN 1
+#define HAVE_MMAP 1
+#define HAVE_SBRK 1
 #define HAVE_STRINGS_H 1
 #define HAVE_SYS_PARAM_H 1
 #define HAVE_SYS_TIME_H 1
 #define TIME_WITH_SYS_TIME 1
-#define HAVE_ERRNO_H 1
 
 #endif
@@ -29 +34 @@
 #define HAVE_ICU 1
 #define HAVE_PCREPOSIX 1
+#define HAVE_STDINT_H 1
 #define HAVE_STRING_H 1
-#define HAVE_STDINT_H 1
-
-#define HAVE_MMAP 1
-#define HAVE_SBRK 1
 
 #ifdef __ppc__
 #define WORDS_BIGENDIAN 1
 #endif
-
-/* define to debug garbage collection */
-#undef DEBUG_COLLECTOR
 
 #define KXC_CHANGES 1

trunk/JavaScriptCore/pcre/pcre_exec.c

@@ -1948 +1948 @@
       length = 1;
       GETUTF8CHARLEN(fc, ecode, length);
-      int utf16Length = fc > 0xFFFF ? 2 : 1;
+      int utf16Length; // don't initialize on this line as workaround for Win32 compile problem
+      utf16Length = fc > 0xFFFF ? 2 : 1;
       if (min * utf16Length > md->end_subject - eptr) RRETURN(MATCH_NOMATCH);
       ecode += length;