Reviewed by Maciej and Darin.

        * kxmlcore/Assertions.h: This file only works with __APPLE__ right now
        * kjs/interpreter.cpp: ditto
        * kjs/simple_number.h: Add assert.h and remove from config.h
        * kjs/array_object.cpp: Use relative paths for kxmlcore includes
        * kjs/testkjs.cpp: Use relative paths for kxmlcore includes

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@12305 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 9ab2fe5283b35f45d02599d8aa3b24784d29e574..a17226079a3586a3cd6d6ae0029d2eb6a4629587 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,8 +1,12 @@
 2006-01-23  George Staikos <staikos@opensource.apple.com>
 
-       Reviewed by Maciej.
+       Reviewed by Maciej and Darin.
 
        * kxmlcore/Assertions.h: This file only works with __APPLE__ right now
+        * kjs/interpreter.cpp: ditto
+        * kjs/simple_number.h: Add assert.h and remove from config.h
+        * kjs/array_object.cpp: Use relative paths for kxmlcore includes
+        * kjs/testkjs.cpp: Use relative paths for kxmlcore includes
 
 2006-01-23  George Staikos <staikos@opensource.apple.com>
 

diff --git a/JavaScriptCore/kjs/array_object.cpp b/JavaScriptCore/kjs/array_object.cpp
index f54b9fd0119663b02cfd335477b9dc2ebf480699..6ad8c1804bd027a11f851e1a123000dc453204b8 100644 (file)
--- a/JavaScriptCore/kjs/array_object.cpp
+++ b/JavaScriptCore/kjs/array_object.cpp
@@ -32,7 +32,7 @@
 #include "reference_list.h"
 #include "types.h"
 #include "value.h"
-#include "HashSet.h"
+#include <kxmlcore/HashSet.h>
 
 #include "array_object.lut.h"
 

diff --git a/JavaScriptCore/kjs/config.h b/JavaScriptCore/kjs/config.h
index 41edfd0becba18deb3b88e285bb81b1f4b6fc361..465ca83566bb02b077a6436f2801cb96bd3fa9c2 100644 (file)
--- a/JavaScriptCore/kjs/config.h
+++ b/JavaScriptCore/kjs/config.h
@@ -19,8 +19,6 @@
 #define HAVE_SYS_TIMEB_H 1
 #define USE_SYSTEM_MALLOC 1
 
-#include <assert.h>
-
 #else
 
 #define HAVE_ERRNO_H 1

diff --git a/JavaScriptCore/kjs/interpreter.cpp b/JavaScriptCore/kjs/interpreter.cpp
index 85df6484dd9ad9117f206afea4a8f1b86f5ec04b..745809354e860e590a9f2e0eab052fc7ba7a0b1b 100644 (file)
--- a/JavaScriptCore/kjs/interpreter.cpp
+++ b/JavaScriptCore/kjs/interpreter.cpp
@@ -36,7 +36,7 @@
 #include "nodes.h"
 #include "object.h"
 #include "operations.h"
-#if !WIN32
+#if __APPLE__
 #include "runtime.h"
 #endif
 #include "types.h"

diff --git a/JavaScriptCore/kjs/simple_number.h b/JavaScriptCore/kjs/simple_number.h
index ff53f8e677c249b26269460a2130b9b45a09d3dc..5574fa633614bf9e5491b8b4e916dde57ecdaf65 100644 (file)
--- a/JavaScriptCore/kjs/simple_number.h
+++ b/JavaScriptCore/kjs/simple_number.h
@@ -22,6 +22,7 @@
 #ifndef KJS_SIMPLE_NUMBER_H
 #define KJS_SIMPLE_NUMBER_H
 
+#include <assert.h>
 #include <stdlib.h>
 #include "kxmlcore/AlwaysInline.h"
 

diff --git a/JavaScriptCore/kjs/testkjs.cpp b/JavaScriptCore/kjs/testkjs.cpp
index 7827aa036684e9236d3ccff1dd1ebf5a267f5291..7f83180506f767e58ea477d1406d9f152f4817f5 100644 (file)
--- a/JavaScriptCore/kjs/testkjs.cpp
+++ b/JavaScriptCore/kjs/testkjs.cpp
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "HashTraits.h"
+#include <kxmlcore/HashTraits.h>
 #include "value.h"
 #include "object.h"
 #include "types.h"