Changeset 181315 in webkit


Ignore:
Timestamp:
Mar 9, 2015 11:56:28 PM (9 years ago)
Author:
mark.lam@apple.com
Message:

Yet another build fix for Windows.
​https://webkit.org/b/142513>

Reviewed by Alex Christensen.

Looks like MSVC requires the function be explicitly declared in a header file
in order for it to be linkable from another file in the same project. This is
strange, but it seems to make MSVC happy.

Also fixed a typo in testapi.vcxproj.filters.

  • API/tests/CompareAndSwapTest.cpp:
  • API/tests/CompareAndSwapTest.h: Added.
  • API/tests/testapi.c:
  • JavaScriptCore.vcxproj/testapi/testapi.vcxproj:
  • JavaScriptCore.vcxproj/testapi/testapi.vcxproj.filters:
  • JavaScriptCore.xcodeproj/project.pbxproj:
Location:
trunk/Source/JavaScriptCore
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/API/tests/CompareAndSwapTest.cpp

    r181309 r181315  
    2525
    2626#include "config.h"
     27#include "CompareAndSwapTest.h"
    2728
    2829#include <stdio.h>
    2930#include <wtf/Atomics.h>
    3031#include <wtf/Threading.h>
    31 
    32 // Regression test for webkit.org/b/142513
    33 extern "C" JS_EXPORT_PRIVATE void testCompareAndSwap();
    3432
    3533class Bitmap {

  • trunk/Source/JavaScriptCore/API/tests/testapi.c

    r181305 r181315  
    4646#endif
    4747
     48#include "CompareAndSwapTest.h"
    4849#include "CustomGlobalObjectClassTest.h"
    4950
    … …  
    5152void testObjectiveCAPI(void);
    5253#endif
    53 void testCompareAndSwap();
    5454
    5555bool assertTrue(bool value, const char* message);

  • trunk/Source/JavaScriptCore/ChangeLog

    r181310 r181315  
     12015-03-09  Mark Lam  <mark.lam@apple.com>
     2
     3        Yet another build fix for Windows.
     4        https://webkit.org/b/142513>
     5
     6        Reviewed by Alex Christensen.
     7
     8        Looks like MSVC requires the function be explicitly declared in a header file
     9        in order for it to be linkable from another file in the same project.  This is
     10        strange, but it seems to make MSVC happy.
     11
     12        Also fixed a typo in testapi.vcxproj.filters.
     13
     14        * API/tests/CompareAndSwapTest.cpp:
     15        * API/tests/CompareAndSwapTest.h: Added.
     16        * API/tests/testapi.c:
     17        * JavaScriptCore.vcxproj/testapi/testapi.vcxproj:
     18        * JavaScriptCore.vcxproj/testapi/testapi.vcxproj.filters:
     19        * JavaScriptCore.xcodeproj/project.pbxproj:
     20
    1212015-03-09  Chris Dumez  <cdumez@apple.com>
    222

  • trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapi.vcxproj

    r181305 r181315  
    294294    <ClCompile Include="..\..\API\tests\testapi.c" />
    295295    <ClCompile Include="..\..\API\tests\CompareAndSwapTest.cpp" />
     296    <ClInclude Include="..\..\API\tests\CompareAndSwapTest.h" />
    296297    <ClCompile Include="..\..\API\tests\CustomGlobalObjectClassTest.c" />
    297298    <ClInclude Include="..\..\API\tests\CustomGlobalObjectClassTest.h" />

  • trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapi.vcxproj.filters

    r181305 r181315  
    99  <ItemGroup>
    1010    <ClCompile Include="..\..\API\tests\testapi.c" />
    11     <ClCompile Include="..\..\API\tests\CompareAndSwap.cpp" />
     11    <ClCompile Include="..\..\API\tests\CompareAndSwapTest.cpp" />
     12    <ClInclude Include="..\..\API\tests\CompareAndSwapTest.h" />
    1213    <ClCompile Include="..\..\API\tests\CustomGlobalObjectClassTest.c" />
    1314    <ClInclude Include="..\..\API\tests\CustomGlobalObjectClassTest.h" />

  • trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

    r181305 r181315  
    33783378                FED94F2D171E3E2300BE77A4 /* WatchdogMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WatchdogMac.cpp; sourceTree = "<group>"; };
    33793379                FEF040501AAE662D00BD28B0 /* CompareAndSwapTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CompareAndSwapTest.cpp; path = API/tests/CompareAndSwapTest.cpp; sourceTree = "<group>"; };
     3380                FEF040521AAEC4ED00BD28B0 /* CompareAndSwapTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CompareAndSwapTest.h; path = API/tests/CompareAndSwapTest.h; sourceTree = "<group>"; };
    33803381                FEF6835A174343CC00A32E25 /* JITStubsARM.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JITStubsARM.h; sourceTree = "<group>"; };
    33813382                FEF6835B174343CC00A32E25 /* JITStubsARMv7.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JITStubsARMv7.h; sourceTree = "<group>"; };
    … …  
    37353736                        children = (
    37363737                                FEF040501AAE662D00BD28B0 /* CompareAndSwapTest.cpp */,
     3738                                FEF040521AAEC4ED00BD28B0 /* CompareAndSwapTest.h */,
    37373739                                C203281E1981979D0088B499 /* CustomGlobalObjectClassTest.c */,
    37383740                                C203281F1981979D0088B499 /* CustomGlobalObjectClassTest.h */,
Note: See TracChangeset for help on using the changeset viewer.