[webkit-changes] cvs commit: JavaScriptCore/pcre pcre_exec.c

[Darin]

darin       05/10/08 21:25:00

  Modified:    .        ChangeLog
               kjs      config.h
               pcre     pcre_exec.c
  Log:
          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.
  
  Revision  Changes    Path
  1.856     +16 -0     JavaScriptCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/JavaScriptCore/ChangeLog,v
  retrieving revision 1.855
  retrieving revision 1.856
  diff -u -r1.855 -r1.856
  --- ChangeLog	6 Oct 2005 01:13:17 -0000	1.855
  +++ ChangeLog	9 Oct 2005 04:24:58 -0000	1.856
  @@ -1,3 +1,19 @@
  +2005-10-08  Justin Haygood  <justin at xiondigital.net>
  +
  +        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  <ggaren at apple.com>
    
           - Darin and I rewrote our implementation of the SimpleNumber class
  
  
  
  1.12      +7 -8      JavaScriptCore/kjs/config.h
  
  Index: config.h
  ===================================================================
  RCS file: /cvs/root/JavaScriptCore/kjs/config.h,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- config.h	4 Oct 2005 01:43:58 -0000	1.11
  +++ config.h	9 Oct 2005 04:25:00 -0000	1.12
  @@ -1,7 +1,10 @@
   #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
   #define HAVE_SYS_TIME_H 1
  @@ -15,32 +18,28 @@
   
   #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
   
   #define HAVE_FUNC_STRTOLL 1
   #define HAVE_ICU 1
   #define HAVE_PCREPOSIX 1
  -#define HAVE_STRING_H 1
   #define HAVE_STDINT_H 1
  -
  -#define HAVE_MMAP 1
  -#define HAVE_SBRK 1
  +#define HAVE_STRING_H 1
   
   #ifdef __ppc__
   #define WORDS_BIGENDIAN 1
   #endif
   
  -/* define to debug garbage collection */
  -#undef DEBUG_COLLECTOR
  -
   #define KXC_CHANGES 1
   
   #ifdef __cplusplus
  
  
  
  1.5       +2 -1      JavaScriptCore/pcre/pcre_exec.c
  
  Index: pcre_exec.c
  ===================================================================
  RCS file: /cvs/root/JavaScriptCore/pcre/pcre_exec.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- pcre_exec.c	29 Sep 2005 22:05:12 -0000	1.4
  +++ pcre_exec.c	9 Oct 2005 04:25:00 -0000	1.5
  @@ -1947,7 +1947,8 @@
   #if PCRE_UTF16
         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;