162059 2016-09-16 06:01:33 -0700 [Win] Compile fix. 2016-09-16 10:38:47 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pvollan pvollan achristensen bfulgham commit-queue webkit-bug-importer oldest_to_newest 1230384 0 pvollan 2016-09-16 06:01:33 -0700 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. 1230387 1 289059 pvollan 2016-09-16 06:12:48 -0700 Created attachment 289059 Patch 1230388 2 pvollan 2016-09-16 06:59:31 -0700 <rdar://problem/28279258> 1230406 3 achristensen 2016-09-16 09:17:48 -0700 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] 1230408 4 achristensen 2016-09-16 09:21:28 -0700 That's a separate issue. 1230412 5 achristensen 2016-09-16 09:24:07 -0700 I fixed the other issue in r206024 1230422 6 289059 commit-queue 2016-09-16 09:42:52 -0700 Comment on attachment 289059 Patch Clearing flags on attachment: 289059 Committed r206027: <http://trac.webkit.org/changeset/206027> 1230423 7 commit-queue 2016-09-16 09:42:56 -0700 All reviewed patches have been landed. Closing bug. 1230450 8 pvollan 2016-09-16 10:38:47 -0700 (In reply to comment #5) > I fixed the other issue in r206024 Thanks, Alex! 289059 2016-09-16 06:12:48 -0700 2016-09-16 09:42:52 -0700 Patch bug-162059-20160916061011.patch text/plain 1680 pvollan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwNjAyMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE2LTA5LTE2ICBQZXIgQXJu ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbV2luXSBDb21waWxlIGZp eC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MjA1 OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElmIGFu IGluY2x1ZGUgZmlsZSBleGlzdHMgaW4gdHdvIHBsYWNlcyBpbiB0aGUgaW5jbHVkZSBwYXRocywg d2UgY2FuIGVuZCB1cCBpbmNsdWRpbmcgdGhlIGZpbGUgdHdpY2UsCisgICAgICAgIHNpbmNlICNw cmFnbWEgb25jZSB3aWxsIG5vdCBwcm90ZWN0IHVzIGFnYWluc3QgdGhpcy4KKworICAgICAgICAq IFBsYXRmb3JtV2luLmNtYWtlOiBQdXQgV2ViQ29yZSBmb3J3YXJkaW5nIGZvbGRlciBmaXJzdCBp biBpbmNsdWRlIGxpc3QuCisKIDIwMTYtMDktMTYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dh cmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtUZXh0dXJlTWFwcGVyXSBTY3JvbGxpbmcgdGhy b3VnaCAwMS5vcmcvZGxleW5hIGNyYXNoZXMgV2ViS2l0V2ViUHJvY2VzcwpJbmRleDogU291cmNl L1dlYkNvcmUvUGxhdGZvcm1XaW4uY21ha2UKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv UGxhdGZvcm1XaW4uY21ha2UJKHJldmlzaW9uIDIwNjAyMCkKKysrIFNvdXJjZS9XZWJDb3JlL1Bs YXRmb3JtV2luLmNtYWtlCSh3b3JraW5nIGNvcHkpCkBAIC0xLDYgKzEsNyBAQAogYWRkX2RlZmlu aXRpb25zKC9iaWdvYmopCiAKIGxpc3QoQVBQRU5EIFdlYkNvcmVfSU5DTFVERV9ESVJFQ1RPUklF UworICAgICIke1dFQkNPUkVfRElSfS9Gb3J3YXJkaW5nSGVhZGVycyIKICAgICAiJHtDTUFLRV9C SU5BUllfRElSfS8uLi9pbmNsdWRlL3ByaXZhdGUiCiAgICAgIiR7Q01BS0VfQklOQVJZX0RJUn0v Li4vaW5jbHVkZS9wcml2YXRlL0phdmFTY3JpcHRDb3JlIgogICAgICIke0RFUklWRURfU09VUkNF U19ESVJ9L0ZvcndhcmRpbmdIZWFkZXJzL0FOR0xFIgpAQCAtMjQsNyArMjUsNiBAQCBsaXN0KEFQ UEVORCBXZWJDb3JlX0lOQ0xVREVfRElSRUNUT1JJRVMKICAgICAiJHtERVJJVkVEX1NPVVJDRVNf RElSfS9Gb3J3YXJkaW5nSGVhZGVycy9KYXZhU2NyaXB0Q29yZS9ydW50aW1lIgogICAgICIke0RF UklWRURfU09VUkNFU19ESVJ9L0ZvcndhcmRpbmdIZWFkZXJzL0phdmFTY3JpcHRDb3JlL3lhcnIi CiAgICAgIiR7REVSSVZFRF9TT1VSQ0VTX0RJUn0vRm9yd2FyZGluZ0hlYWRlcnMvV1RGIgotICAg ICIke1dFQkNPUkVfRElSfS9Gb3J3YXJkaW5nSGVhZGVycyIKICAgICAiJHtXRUJDT1JFX0RJUn0v YWNjZXNzaWJpbGl0eS93aW4iCiAgICAgIiR7V0VCQ09SRV9ESVJ9L3BhZ2Uvd2luIgogICAgICIk e1dFQkNPUkVfRElSfS9wbGF0Zm9ybS9jZiIK