Changeset 10412 in webkit for trunk/JavaScriptCore

Timestamp:

Aug 31, 2005, 12:57:56 AM (20 years ago)

Author:

darin

Message:

Reviewed, tweaked, and landed by Darin.

• fixed ​http://bugzilla.opendarwin.org/show_bug.cgi?id=4085
• fixed ​http://bugzilla.opendarwin.org/show_bug.cgi?id=4087
• fixed ​http://bugzilla.opendarwin.org/show_bug.cgi?id=4096 Some fixes for compiling on windows.

• kjs/config.h: Added a WIN32 case in here, with suitable defines. (To be tweaked as necessary.)
• kjs/function.cpp: Took out APPLE_CHANGES around use of ICU.
• kjs/operations.cpp: Removed some bogus code that always set HAVE_FLOAT_H.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/config.h (modified) (1 diff)
• kjs/function.cpp (modified) (2 diffs)
• kjs/operations.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2005-08-31  Justin Haygood  <[email protected]>
+
+        Reviewed, tweaked, and landed by Darin.
+
+        - fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=4085
+        - fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=4087
+        - fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=4096
+          Some fixes for compiling on windows.
+
+        * kjs/config.h: Added a WIN32 case in here, with suitable defines.
+        (To be tweaked as necessary.)
+        * kjs/function.cpp: Took out APPLE_CHANGES around use of ICU.
+        * kjs/operations.cpp: Removed some bogus code that always set HAVE_FLOAT_H.
+
 2005-08-30  Darin Adler  <[email protected]>
 

trunk/JavaScriptCore/kjs/config.h

@@ +1 @@
+#if !WIN32
+
 #define HAVE_FUNC_ISINF 1
 #define HAVE_FUNC_ISNAN 1
-#define HAVE_FUNC_STRTOLL 1
-#define HAVE_STRING_H 1
 #define HAVE_STRINGS_H 1
 #define HAVE_SYS_PARAM_H 1
 #define HAVE_SYS_TIME_H 1
+#define TIME_WITH_SYS_TIME 1
+
+#else
+
+#define HAVE_FLOAT_H 1
+#define HAVE_FUNC__FINITE 1
+
+#endif
+
+#define HAVE_FUNC_STRTOLL 1
+#define HAVE_ICU 1
 #define HAVE_PCREPOSIX 1
-#define TIME_WITH_SYS_TIME 1
+#define HAVE_STRING_H 1
+
 #ifdef __ppc__
 #define WORDS_BIGENDIAN 1

trunk/JavaScriptCore/kjs/function.cpp

@@ -39 +39 @@
 #include <assert.h>
 #include <string.h>
-
-#if APPLE_CHANGES
+#include <ctype.h>
+
 #include <unicode/uchar.h>
-#endif
 
 using namespace KXMLCore;
@@ -661 +660 @@
             return true;
         default:
-#if APPLE_CHANGES
             return u_charType(c) == U_SPACE_SEPARATOR;
-#else
-            // ### properly support other Unicode Zs characters
-            return false;
-#endif
     }
 }

trunk/JavaScriptCore/kjs/operations.cpp

@@ -23 +23 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
-#ifndef HAVE_FLOAT_H   /* just for !Windows */
-#define HAVE_FLOAT_H 0
-#define HAVE_FUNC__FINITE 0
 #endif