diff options
Diffstat (limited to 'Source/JavaScriptCore')
6 files changed, 10 insertions, 6 deletions
diff --git a/Source/JavaScriptCore/PlatformQt.cmake b/Source/JavaScriptCore/PlatformQt.cmake index 11587f401..057929139 100644 --- a/Source/JavaScriptCore/PlatformQt.cmake +++ b/Source/JavaScriptCore/PlatformQt.cmake @@ -29,7 +29,9 @@ if (WIN32) list(REMOVE_ITEM JavaScriptCore_SOURCES inspector/JSGlobalObjectInspectorController.cpp ) +endif () +if (MSVC) file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore) set(JavaScriptCore_PRE_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/JavaScriptCore/preBuild.cmd") diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h b/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h index b8051d370..f502a2551 100644 --- a/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h +++ b/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h @@ -32,6 +32,10 @@ #include "AbstractMacroAssembler.h" #include <wtf/Optional.h> +#if COMPILER(MSVC) +#include <intrin.h> +#endif + namespace JSC { class MacroAssemblerX86Common : public AbstractMacroAssembler<X86Assembler, MacroAssemblerX86Common> { diff --git a/Source/JavaScriptCore/debugger/DebuggerCallFrame.h b/Source/JavaScriptCore/debugger/DebuggerCallFrame.h index aa3cca52b..b583455bc 100644 --- a/Source/JavaScriptCore/debugger/DebuggerCallFrame.h +++ b/Source/JavaScriptCore/debugger/DebuggerCallFrame.h @@ -61,7 +61,7 @@ public: // line and column are in base 0 e.g. the first line is line 0. int line() const { return m_position.m_line.zeroBasedInt(); } int column() const { return m_position.m_column.zeroBasedInt(); } - JS_EXPORT_PRIVATE const TextPosition& position() const { return m_position; } + const TextPosition& position() const { return m_position; } JS_EXPORT_PRIVATE JSGlobalObject* vmEntryGlobalObject() const; JS_EXPORT_PRIVATE DebuggerScope* scope(); diff --git a/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.cpp b/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.cpp index 52a92c669..28f703801 100644 --- a/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.cpp +++ b/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.cpp @@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#define __STDC_FORMAT_MACROS #include "config.h" #if USE(ARM64_DISASSEMBLER) diff --git a/Source/JavaScriptCore/disassembler/ARM64Disassembler.cpp b/Source/JavaScriptCore/disassembler/ARM64Disassembler.cpp index bb8fde4e4..ac52213df 100644 --- a/Source/JavaScriptCore/disassembler/ARM64Disassembler.cpp +++ b/Source/JavaScriptCore/disassembler/ARM64Disassembler.cpp @@ -23,7 +23,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#define __STDC_FORMAT_MACROS #include "config.h" #include "Disassembler.h" diff --git a/Source/JavaScriptCore/runtime/VM.h b/Source/JavaScriptCore/runtime/VM.h index 759bbd97d..8ba705a78 100644 --- a/Source/JavaScriptCore/runtime/VM.h +++ b/Source/JavaScriptCore/runtime/VM.h @@ -247,10 +247,10 @@ public: JS_EXPORT_PRIVATE ~VM(); JS_EXPORT_PRIVATE Watchdog& ensureWatchdog(); - JS_EXPORT_PRIVATE Watchdog* watchdog() { return m_watchdog.get(); } + Watchdog* watchdog() { return m_watchdog.get(); } #if ENABLE(SAMPLING_PROFILER) - JS_EXPORT_PRIVATE SamplingProfiler* samplingProfiler() { return m_samplingProfiler.get(); } + SamplingProfiler* samplingProfiler() { return m_samplingProfiler.get(); } JS_EXPORT_PRIVATE void ensureSamplingProfiler(RefPtr<Stopwatch>&&); #endif @@ -597,7 +597,7 @@ public: JS_EXPORT_PRIVATE void queueMicrotask(JSGlobalObject*, PassRefPtr<Microtask>); JS_EXPORT_PRIVATE void drainMicrotasks(); - JS_EXPORT_PRIVATE void setShouldRewriteConstAsVar(bool shouldRewrite) { m_shouldRewriteConstAsVar = shouldRewrite; } + void setShouldRewriteConstAsVar(bool shouldRewrite) { m_shouldRewriteConstAsVar = shouldRewrite; } ALWAYS_INLINE bool shouldRewriteConstAsVar() { return m_shouldRewriteConstAsVar; } inline bool shouldTriggerTermination(ExecState*); |