RESOLVED FIXED162059
[Win] Compile fix. 
https://bugs.webkit.org/show_bug.cgi?id=162059
Summary [Win] Compile fix.
Per Arne Vollan
Reported 2016-09-16 06:01:33 PDT
If the JavaScripCore folder with forwarding headers contains the inspector folder with derived sources, I get the following compile error: webkitbuild\release\derivedsources\forwardingheaders\javascriptcore\InspectorProtocolObjects.h(304): error C2995: 'WTF::String Inspector::Protocol::InspectorHelpers::getEnumConstantValue(T)': function template has already been defined (compiling source file C:\Projects\WebKit2\OpenSource\Source\WebCore\inspector\InspectorAllInOne.cpp) \webkitbuild\release\derivedsources\forwardingheaders\javascriptcore\inspector\InspectorProtocolObjects.h(301): note: see declaration of 'Inspector::Protocol::InspectorHelpers::getEnumConstantValue' (compiling source file C:\Projects\WebKit2\OpenSource\Source\WebCore\inspector\InspectorAllInOne.cpp) This happens because the file InspectorProtocolObjects.h exists in both folders, and #pragma once will not prevent us from including both files. An include of the type <inspector/InspectorProtocolObjects.h> will include the file from the inspector folder, while <JavaScriptCore/InspectorProtocolObjects.h> will include the file from the JavaScriptCore folder. This can be fixed by putting the WebCore forwarding folder first in the include list. This means that <inspector/InspectorProtocolObjects.h> will also include the file in the JavaScriptCore folder.
Attachments
Patch (1.64 KB, patch)
2016-09-16 06:12 PDT, Per Arne Vollan 		no flags
DetailsFormatted DiffDiff
View All Add attachment proposed patch, testcase, etc.
Per Arne Vollan
Comment 1 2016-09-16 06:12:48 PDT
Created attachment 289059 [details] Patch
Per Arne Vollan
Comment 2 2016-09-16 06:59:31 PDT
<rdar://problem/28279258>
Alex Christensen
Comment 3 2016-09-16 09:17:48 PDT
Windows EWS is seeing this. Does it fix this? C:\cygwin\home\buildbot\WebKit\Source\WebCore\DerivedSources.cpp(345): fatal error C1083: Cannot open include file: 'JSMediaStreamTrackSourcesCallback.cpp': No such file or directory [C:\cygwin\home\buildbot\WebKit\WebKitBuild\Release\Source\WebCore\WebCoreDerivedSources.vcxproj]
Alex Christensen
Comment 4 2016-09-16 09:21:28 PDT
That's a separate issue.
Alex Christensen
Comment 5 2016-09-16 09:24:07 PDT
I fixed the other issue in r206024
WebKit Commit Bot
Comment 6 2016-09-16 09:42:52 PDT
Comment on attachment 289059 [details] Patch Clearing flags on attachment: 289059 Committed r206027: <http://trac.webkit.org/changeset/206027>
WebKit Commit Bot
Comment 7 2016-09-16 09:42:56 PDT
All reviewed patches have been landed. Closing bug.
Per Arne Vollan
Comment 8 2016-09-16 10:38:47 PDT
(In reply to comment #5) > I fixed the other issue in r206024 Thanks, Alex!
Note You need to log in before you can comment on or make changes to this bug.