From 2941fdf5967bd8ba50f028f6a538c68682ae4ce6 Mon Sep 17 00:00:00 2001 From: "akling@apple.com" Date: Thu, 31 Jul 2014 06:51:47 +0000 Subject: [PATCH] Speculative Windows build fix. Try to dllimport the dllexported global object HashTable. * jsc.cpp: * testRegExp.cpp: git-svn-id: https://svn.webkit.org/repository/webkit/trunk@171843 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/JavaScriptCore/ChangeLog | 9 +++++++++ Source/JavaScriptCore/jsc.cpp | 2 +- Source/JavaScriptCore/testRegExp.cpp | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog index 00608b5..35be82f 100644 --- a/Source/JavaScriptCore/ChangeLog +++ b/Source/JavaScriptCore/ChangeLog @@ -1,5 +1,14 @@ 2014-07-30 Andreas Kling + Speculative Windows build fix. + + Try to dllimport the dllexported global object HashTable. + + * jsc.cpp: + * testRegExp.cpp: + +2014-07-30 Andreas Kling + PropertyName's internal string is always atomic. diff --git a/Source/JavaScriptCore/jsc.cpp b/Source/JavaScriptCore/jsc.cpp index 1185ecf..c9eb2c2 100644 --- a/Source/JavaScriptCore/jsc.cpp +++ b/Source/JavaScriptCore/jsc.cpp @@ -95,7 +95,7 @@ using namespace JSC; using namespace WTF; namespace JSC { -extern const struct HashTable globalObjectTable; +WTF_IMPORT extern const struct HashTable globalObjectTable; } namespace { diff --git a/Source/JavaScriptCore/testRegExp.cpp b/Source/JavaScriptCore/testRegExp.cpp index dc64c72..c575c68 100644 --- a/Source/JavaScriptCore/testRegExp.cpp +++ b/Source/JavaScriptCore/testRegExp.cpp @@ -46,7 +46,7 @@ #endif namespace JSC { -extern const struct HashTable globalObjectTable; +WTF_IMPORT extern const struct HashTable globalObjectTable; } const int MaxLineLength = 100 * 1024; -- 1.8.3.1