Reviewed by Maciej
authormjs <mjs@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 18 Jun 2006 06:25:06 +0000 (06:25 +0000)
committermjs <mjs@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 18 Jun 2006 06:25:06 +0000 (06:25 +0000)
        http://bugzilla.opendarwin.org/show_bug.cgi?id=9491
        Windows build breaks in interpreter.cpp

        * kjs/interpreter.cpp
        (KJS::TimeoutChecker::pauseTimeoutCheck):
        (KJS::TimeoutChecker::resumeTimeoutCheck):
        Make sure to only assert equality with s_executingInterpreter when it
        is being used (i.e. when HAVE(SYS_TIME_H) == true)

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

JavaScriptCore/ChangeLog
JavaScriptCore/kjs/interpreter.cpp

index 288b56614a0e3623daa9559905211f0b0bf2023e..0ee0c3842170786e834c24225708b02fbeadc52c 100644 (file)
@@ -1,3 +1,17 @@
+2006-06-16  Ben Goodger <beng@google.com>
+        
+        Reviewed by Maciej
+
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=9491
+        Windows build breaks in interpreter.cpp 
+
+        * kjs/interpreter.cpp
+        (KJS::TimeoutChecker::pauseTimeoutCheck):
+        (KJS::TimeoutChecker::resumeTimeoutCheck):
+        Make sure to only assert equality with s_executingInterpreter when it 
+        is being used (i.e. when HAVE(SYS_TIME_H) == true)
+
+
 2006-06-17  David Kilzer  <ddkilzer@kilzer.net>
 
         Reviewed by darin.
index 1d792df913fee50a0e9df75ee2ac0f47362aa89f..7fcefa88c564d95b6ad5aa8795f48a27d36d0ac9 100644 (file)
@@ -142,9 +142,9 @@ void TimeoutChecker::alarmHandler(int)
 
 void TimeoutChecker::pauseTimeoutCheck(Interpreter* interpreter)
 {
+#if HAVE(SYS_TIME_H)
     ASSERT(interpreter == s_executingInterpreter);
 
-#if HAVE(SYS_TIME_H)
     void (*currentSignalHandler)(int);
    
     // Block signal
@@ -163,7 +163,9 @@ void TimeoutChecker::pauseTimeoutCheck(Interpreter* interpreter)
 
 void TimeoutChecker::resumeTimeoutCheck(Interpreter* interpreter)
 {
+#if HAVE(SYS_TIME_H)
     ASSERT(interpreter == s_executingInterpreter);
+#endif
 
     interpreter->m_pauseTimeoutCheckCount--;