Changeset 35310 in webkit for trunk/JavaScriptCore/VM/Machine.cpp

Timestamp:

Jul 23, 2008, 6:00:35 PM (17 years ago)

Author:

Adam Roben

Message:

Windows build fixes

Build fix after r35293:

• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: Add API/ to the include path.

Build fix after r35305:

• VM/Machine.cpp:
• VM/Machine.h:
• VM/Opcode.cpp:
• VM/Opcode.h: Completely compile out all sampler-related code when SAMPLING_TOOL_ENABLED is 0. The sampler code can't be compiled 1) on non-AllInOne configurations due to circular header dependencies, and 2) on platforms that don't have a usleep() function, such as Windows.

File:

• trunk/JavaScriptCore/VM/Machine.cpp (modified) (1 diff)

trunk/JavaScriptCore/VM/Machine.cpp

@@ -474 +474 @@
 
 Machine::Machine()
-    : m_sampler(0)
-    , m_reentryDepth(0)
+    :
+#if SAMPLING_TOOL_ENABLED
+      m_sampler(0),
+#else
+      m_reentryDepth(0)
+#endif
     , m_timeoutTime(0)
     , m_timeAtLastCheckTimeout(0)