Qt Windows build fix. Include the time-related headers in the correct place.

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

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index f65131d4688fd9665e66fcf5ab0e5453cc0637ee..cd2d964e7328473644ef54a40aae0fd83b851fc5 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,10 @@
+2007-12-05  Mark Rowe  <mrowe@apple.com>
+
+        Qt Windows build fix.  Include the time-related headers in the correct place.
+
+        * kjs/JSGlobalObject.cpp:
+        * kjs/interpreter.cpp:
+
 2007-12-05  Darin Adler  <darin@apple.com>
 
         Not reviewed; just undoing a previous commit.

diff --git a/JavaScriptCore/kjs/JSGlobalObject.cpp b/JavaScriptCore/kjs/JSGlobalObject.cpp
index 1ba20b19baaad11b9d812ba86ae3975fa1bfe6ef..15774cee9e9f7ba460d95e0b410f09f3bd5f6304 100644 (file)
--- a/JavaScriptCore/kjs/JSGlobalObject.cpp
+++ b/JavaScriptCore/kjs/JSGlobalObject.cpp
@@ -41,7 +41,18 @@
 #include "object_object.h"
 #include "regexp_object.h"
 #include "string_object.h"
+
+#if HAVE(SYS_TIME_H)
 #include <sys/time.h>
+#endif
+
+#if PLATFORM(WIN_OS)
+#include <windows.h>
+#endif
+
+#if PLATFORM(QT)
+#include <QDateTime>
+#endif
 
 namespace KJS {
 

diff --git a/JavaScriptCore/kjs/interpreter.cpp b/JavaScriptCore/kjs/interpreter.cpp
index 4fb3764c1629eb480436fe6d7ef56618e4a7cdaf..016672898a83243efa14033b969587d57fb31fbc 100644 (file)
--- a/JavaScriptCore/kjs/interpreter.cpp
+++ b/JavaScriptCore/kjs/interpreter.cpp
@@ -52,18 +52,6 @@
 #include <stdio.h>
 #include <wtf/Assertions.h>
 
-#if HAVE(SYS_TIME_H)
-#include <sys/time.h>
-#endif
-
-#if PLATFORM(WIN_OS)
-#include <windows.h>
-#endif
-
-#if PLATFORM(QT)
-#include <QDateTime>
-#endif
-
 namespace KJS {
 
 Completion Interpreter::checkSyntax(ExecState* exec, const UString& sourceURL, int startingLineNumber, const UString& code)