Fix remaining WTF includes in JavaScriptCore in preparation for moving WTF headers...

https://bugs.webkit.org/show_bug.cgi?id=81834

Reviewed by Adam Barth.

* jsc.cpp:
* os-win32/WinMain.cpp:
* runtime/JSDateMath.cpp:
* runtime/TimeoutChecker.cpp:
* testRegExp.cpp:
* tools/CodeProfiling.cpp:

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

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index ff47ac5..a44174c 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,5 +1,19 @@
 2012-03-21  Eric Seidel  <eric@webkit.org>
 
+        Fix remaining WTF includes in JavaScriptCore in preparation for moving WTF headers out of JavaScriptCore
+        https://bugs.webkit.org/show_bug.cgi?id=81834
+
+        Reviewed by Adam Barth.
+
+        * jsc.cpp:
+        * os-win32/WinMain.cpp:
+        * runtime/JSDateMath.cpp:
+        * runtime/TimeoutChecker.cpp:
+        * testRegExp.cpp:
+        * tools/CodeProfiling.cpp:
+
+2012-03-21  Eric Seidel  <eric@webkit.org>
+
         WTF::MetaAllocator has a weak vtable (discovered when building wtf as a static library)
         https://bugs.webkit.org/show_bug.cgi?id=81838
 

diff --git a/Source/JavaScriptCore/jsc.cpp b/Source/JavaScriptCore/jsc.cpp
index 4d27a80..15184f9 100644 (file)
--- a/Source/JavaScriptCore/jsc.cpp
+++ b/Source/JavaScriptCore/jsc.cpp
@@ -24,7 +24,7 @@
 
 #include "BytecodeGenerator.h"
 #include "Completion.h"
-#include "CurrentTime.h"
+#include <wtf/CurrentTime.h>
 #include "ExceptionHelpers.h"
 #include "InitializeThreading.h"
 #include "Interpreter.h"

diff --git a/Source/JavaScriptCore/os-win32/WinMain.cpp b/Source/JavaScriptCore/os-win32/WinMain.cpp
index 17800d0..d4ff3e6 100644 (file)
--- a/Source/JavaScriptCore/os-win32/WinMain.cpp
+++ b/Source/JavaScriptCore/os-win32/WinMain.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "config.h"
-#include "Vector.h"
+#include <wtf/Vector.h>
 #include <winbase.h>
 #include <winnls.h>
 #include <wtf/UnusedParam.h>

diff --git a/Source/JavaScriptCore/runtime/JSDateMath.cpp b/Source/JavaScriptCore/runtime/JSDateMath.cpp
index 882f86f..29af179 100644 (file)
--- a/Source/JavaScriptCore/runtime/JSDateMath.cpp
+++ b/Source/JavaScriptCore/runtime/JSDateMath.cpp
@@ -72,12 +72,8 @@
 #include "config.h"
 #include "JSDateMath.h"
 
-#include "CurrentTime.h"
 #include "JSObject.h"
-#include "MathExtras.h"
 #include "ScopeChain.h"
-#include "StdLibExtras.h"
-#include "StringExtras.h"
 
 #include <algorithm>
 #include <limits.h>
@@ -86,6 +82,10 @@
 #include <time.h>
 #include <wtf/ASCIICType.h>
 #include <wtf/Assertions.h>
+#include <wtf/CurrentTime.h>
+#include <wtf/MathExtras.h>
+#include <wtf/StdLibExtras.h>
+#include <wtf/StringExtras.h>
 #include <wtf/text/StringBuilder.h>
 
 #if HAVE(ERRNO_H)

diff --git a/Source/JavaScriptCore/runtime/TimeoutChecker.cpp b/Source/JavaScriptCore/runtime/TimeoutChecker.cpp
index 3065c99..8f3d1a5 100644 (file)
--- a/Source/JavaScriptCore/runtime/TimeoutChecker.cpp
+++ b/Source/JavaScriptCore/runtime/TimeoutChecker.cpp
@@ -38,7 +38,7 @@
 #elif OS(WINDOWS)
 #include <windows.h>
 #else
-#include "CurrentTime.h"
+#include <wtf/CurrentTime.h>
 #endif
 
 using namespace std;

diff --git a/Source/JavaScriptCore/testRegExp.cpp b/Source/JavaScriptCore/testRegExp.cpp
index bbea4c8..435da59 100644 (file)
--- a/Source/JavaScriptCore/testRegExp.cpp
+++ b/Source/JavaScriptCore/testRegExp.cpp
@@ -21,7 +21,7 @@
 #include "config.h"
 #include "RegExp.h"
 
-#include "CurrentTime.h"
+#include <wtf/CurrentTime.h>
 #include "InitializeThreading.h"
 #include "JSGlobalObject.h"
 #include "UStringBuilder.h"

diff --git a/Source/JavaScriptCore/tools/CodeProfiling.cpp b/Source/JavaScriptCore/tools/CodeProfiling.cpp
index f116038..740595e 100644 (file)
--- a/Source/JavaScriptCore/tools/CodeProfiling.cpp
+++ b/Source/JavaScriptCore/tools/CodeProfiling.cpp
@@ -27,7 +27,7 @@
 #include "CodeProfiling.h"
 
 #include "CodeProfile.h"
-#include "MetaAllocator.h"
+#include <wtf/MetaAllocator.h>
 
 #if HAVE(SIGNAL_H)
 #include <signal.h>