<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[195155] trunk/Source</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/195155">195155</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-01-15 15:42:04 -0800 (Fri, 15 Jan 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fix internal Windows build
https://bugs.webkit.org/show_bug.cgi?id=153142

Source/JavaScriptCore:

Reviewed by Brent Fulgham.

The internal Windows build builds JavaScriptCore from a directory that is not called JavaScriptCore.
Searching for JavaScriptCore/API/APICast.h fails because it is in SomethingElse/API/APICast.h.
Since we are including the JavaScriptCore directory, it is not necessary to have JavaScriptCore in
the forwarding headers, but removing it allows builds form directories that are not named JavaScriptCore.

* ForwardingHeaders/JavaScriptCore/APICast.h:
* ForwardingHeaders/JavaScriptCore/JSBase.h:
* ForwardingHeaders/JavaScriptCore/JSCTestRunnerUtils.h:
* ForwardingHeaders/JavaScriptCore/JSContextRef.h:
* ForwardingHeaders/JavaScriptCore/JSObjectRef.h:
* ForwardingHeaders/JavaScriptCore/JSRetainPtr.h:
* ForwardingHeaders/JavaScriptCore/JSStringRef.h:
* ForwardingHeaders/JavaScriptCore/JSStringRefCF.h:
* ForwardingHeaders/JavaScriptCore/JSValueRef.h:
* ForwardingHeaders/JavaScriptCore/JavaScript.h:
* ForwardingHeaders/JavaScriptCore/JavaScriptCore.h:
* ForwardingHeaders/JavaScriptCore/OpaqueJSString.h:
* ForwardingHeaders/JavaScriptCore/WebKitAvailability.h:

Source/WebKit2:

Unreviewed addition to Alex's JSC patch, which was reviewed by Brent Fulgham. Pass
-I${JAVASCRIPTCORE_DIR} to g-ir-scanner.

Patch by Michael Catanzaro &lt;mcatanzaro@igalia.com&gt; on 2016-01-15

* PlatformGTK.cmake:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreForwardingHeadersJavaScriptCoreAPICasth">trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/APICast.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreForwardingHeadersJavaScriptCoreJSBaseh">trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSBase.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreForwardingHeadersJavaScriptCoreJSCTestRunnerUtilsh">trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSCTestRunnerUtils.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreForwardingHeadersJavaScriptCoreJSContextRefh">trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSContextRef.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreForwardingHeadersJavaScriptCoreJSObjectRefh">trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSObjectRef.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreForwardingHeadersJavaScriptCoreJSRetainPtrh">trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSRetainPtr.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreForwardingHeadersJavaScriptCoreJSStringRefh">trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSStringRef.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreForwardingHeadersJavaScriptCoreJSStringRefCFh">trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSStringRefCF.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreForwardingHeadersJavaScriptCoreJSValueRefh">trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSValueRef.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreForwardingHeadersJavaScriptCoreJavaScripth">trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JavaScript.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreForwardingHeadersJavaScriptCoreJavaScriptCoreh">trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JavaScriptCore.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreForwardingHeadersJavaScriptCoreOpaqueJSStringh">trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/OpaqueJSString.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreForwardingHeadersJavaScriptCoreWebKitAvailabilityh">trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/WebKitAvailability.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformGTKcmake">trunk/Source/WebKit2/PlatformGTK.cmake</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (195154 => 195155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2016-01-15 23:34:25 UTC (rev 195154)
+++ trunk/Source/JavaScriptCore/ChangeLog        2016-01-15 23:42:04 UTC (rev 195155)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-01-15  Alex Christensen  &lt;achristensen@webkit.org&gt;
+
+        Fix internal Windows build
+        https://bugs.webkit.org/show_bug.cgi?id=153142
+
+        Reviewed by Brent Fulgham.
+
+        The internal Windows build builds JavaScriptCore from a directory that is not called JavaScriptCore.
+        Searching for JavaScriptCore/API/APICast.h fails because it is in SomethingElse/API/APICast.h.
+        Since we are including the JavaScriptCore directory, it is not necessary to have JavaScriptCore in
+        the forwarding headers, but removing it allows builds form directories that are not named JavaScriptCore.
+
+        * ForwardingHeaders/JavaScriptCore/APICast.h:
+        * ForwardingHeaders/JavaScriptCore/JSBase.h:
+        * ForwardingHeaders/JavaScriptCore/JSCTestRunnerUtils.h:
+        * ForwardingHeaders/JavaScriptCore/JSContextRef.h:
+        * ForwardingHeaders/JavaScriptCore/JSObjectRef.h:
+        * ForwardingHeaders/JavaScriptCore/JSRetainPtr.h:
+        * ForwardingHeaders/JavaScriptCore/JSStringRef.h:
+        * ForwardingHeaders/JavaScriptCore/JSStringRefCF.h:
+        * ForwardingHeaders/JavaScriptCore/JSValueRef.h:
+        * ForwardingHeaders/JavaScriptCore/JavaScript.h:
+        * ForwardingHeaders/JavaScriptCore/JavaScriptCore.h:
+        * ForwardingHeaders/JavaScriptCore/OpaqueJSString.h:
+        * ForwardingHeaders/JavaScriptCore/WebKitAvailability.h:
+
</ins><span class="cx"> 2016-01-15  Per Arne Vollan  &lt;peavo@outlook.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [B3][Win64] Compile fixes.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreForwardingHeadersJavaScriptCoreAPICasth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/APICast.h (195154 => 195155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/APICast.h        2016-01-15 23:34:25 UTC (rev 195154)
+++ trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/APICast.h        2016-01-15 23:42:04 UTC (rev 195155)
</span><span class="lines">@@ -1 +1 @@
</span><del>-#include &lt;JavaScriptCore/API/APICast.h&gt;
</del><ins>+#include &lt;API/APICast.h&gt;
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreForwardingHeadersJavaScriptCoreJSBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSBase.h (195154 => 195155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSBase.h        2016-01-15 23:34:25 UTC (rev 195154)
+++ trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSBase.h        2016-01-15 23:42:04 UTC (rev 195155)
</span><span class="lines">@@ -1 +1 @@
</span><del>-#include &lt;JavaScriptCore/API/JSBase.h&gt;
</del><ins>+#include &lt;API/JSBase.h&gt;
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreForwardingHeadersJavaScriptCoreJSCTestRunnerUtilsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSCTestRunnerUtils.h (195154 => 195155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSCTestRunnerUtils.h        2016-01-15 23:34:25 UTC (rev 195154)
+++ trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSCTestRunnerUtils.h        2016-01-15 23:42:04 UTC (rev 195155)
</span><span class="lines">@@ -1 +1 @@
</span><del>-#include &lt;JavaScriptCore/API/JSCTestRunnerUtils.h&gt;
</del><ins>+#include &lt;API/JSCTestRunnerUtils.h&gt;
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreForwardingHeadersJavaScriptCoreJSContextRefh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSContextRef.h (195154 => 195155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSContextRef.h        2016-01-15 23:34:25 UTC (rev 195154)
+++ trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSContextRef.h        2016-01-15 23:42:04 UTC (rev 195155)
</span><span class="lines">@@ -1 +1 @@
</span><del>-#include &lt;JavaScriptCore/API/JSContextRef.h&gt;
</del><ins>+#include &lt;API/JSContextRef.h&gt;
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreForwardingHeadersJavaScriptCoreJSObjectRefh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSObjectRef.h (195154 => 195155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSObjectRef.h        2016-01-15 23:34:25 UTC (rev 195154)
+++ trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSObjectRef.h        2016-01-15 23:42:04 UTC (rev 195155)
</span><span class="lines">@@ -1 +1 @@
</span><del>-#include &lt;JavaScriptCore/API/JSObjectRef.h&gt;
</del><ins>+#include &lt;API/JSObjectRef.h&gt;
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreForwardingHeadersJavaScriptCoreJSRetainPtrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSRetainPtr.h (195154 => 195155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSRetainPtr.h        2016-01-15 23:34:25 UTC (rev 195154)
+++ trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSRetainPtr.h        2016-01-15 23:42:04 UTC (rev 195155)
</span><span class="lines">@@ -1 +1 @@
</span><del>-#include &lt;JavaScriptCore/API/JSRetainPtr.h&gt;
</del><ins>+#include &lt;API/JSRetainPtr.h&gt;
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreForwardingHeadersJavaScriptCoreJSStringRefh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSStringRef.h (195154 => 195155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSStringRef.h        2016-01-15 23:34:25 UTC (rev 195154)
+++ trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSStringRef.h        2016-01-15 23:42:04 UTC (rev 195155)
</span><span class="lines">@@ -1 +1 @@
</span><del>-#include &lt;JavaScriptCore/API/JSStringRef.h&gt;
</del><ins>+#include &lt;API/JSStringRef.h&gt;
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreForwardingHeadersJavaScriptCoreJSStringRefCFh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSStringRefCF.h (195154 => 195155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSStringRefCF.h        2016-01-15 23:34:25 UTC (rev 195154)
+++ trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSStringRefCF.h        2016-01-15 23:42:04 UTC (rev 195155)
</span><span class="lines">@@ -1 +1 @@
</span><del>-#include &lt;JavaScriptCore/API/JSStringRefCF.h&gt;
</del><ins>+#include &lt;API/JSStringRefCF.h&gt;
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreForwardingHeadersJavaScriptCoreJSValueRefh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSValueRef.h (195154 => 195155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSValueRef.h        2016-01-15 23:34:25 UTC (rev 195154)
+++ trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSValueRef.h        2016-01-15 23:42:04 UTC (rev 195155)
</span><span class="lines">@@ -1 +1 @@
</span><del>-#include &lt;JavaScriptCore/API/JSValueRef.h&gt;
</del><ins>+#include &lt;API/JSValueRef.h&gt;
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreForwardingHeadersJavaScriptCoreJavaScripth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JavaScript.h (195154 => 195155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JavaScript.h        2016-01-15 23:34:25 UTC (rev 195154)
+++ trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JavaScript.h        2016-01-15 23:42:04 UTC (rev 195155)
</span><span class="lines">@@ -1 +1 @@
</span><del>-#include &lt;JavaScriptCore/API/JavaScript.h&gt;
</del><ins>+#include &lt;API/JavaScript.h&gt;
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreForwardingHeadersJavaScriptCoreJavaScriptCoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JavaScriptCore.h (195154 => 195155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JavaScriptCore.h        2016-01-15 23:34:25 UTC (rev 195154)
+++ trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JavaScriptCore.h        2016-01-15 23:42:04 UTC (rev 195155)
</span><span class="lines">@@ -1 +1 @@
</span><del>-#include &lt;JavaScriptCore/API/JavaScriptCore.h&gt;
</del><ins>+#include &lt;API/JavaScriptCore.h&gt;
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreForwardingHeadersJavaScriptCoreOpaqueJSStringh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/OpaqueJSString.h (195154 => 195155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/OpaqueJSString.h        2016-01-15 23:34:25 UTC (rev 195154)
+++ trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/OpaqueJSString.h        2016-01-15 23:42:04 UTC (rev 195155)
</span><span class="lines">@@ -1 +1 @@
</span><del>-#include &lt;JavaScriptCore/API/OpaqueJSString.h&gt;
</del><ins>+#include &lt;API/OpaqueJSString.h&gt;
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreForwardingHeadersJavaScriptCoreWebKitAvailabilityh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/WebKitAvailability.h (195154 => 195155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/WebKitAvailability.h        2016-01-15 23:34:25 UTC (rev 195154)
+++ trunk/Source/JavaScriptCore/ForwardingHeaders/JavaScriptCore/WebKitAvailability.h        2016-01-15 23:42:04 UTC (rev 195155)
</span><span class="lines">@@ -1 +1 @@
</span><del>-#include &lt;JavaScriptCore/API/WebKitAvailability.h&gt;
</del><ins>+#include &lt;API/WebKitAvailability.h&gt;
</ins></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (195154 => 195155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2016-01-15 23:34:25 UTC (rev 195154)
+++ trunk/Source/WebKit2/ChangeLog        2016-01-15 23:42:04 UTC (rev 195155)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-01-15  Michael Catanzaro  &lt;mcatanzaro@igalia.com&gt;
+
+        Fix internal Windows build
+        https://bugs.webkit.org/show_bug.cgi?id=153142
+
+        Unreviewed addition to Alex's JSC patch, which was reviewed by Brent Fulgham. Pass
+        -I${JAVASCRIPTCORE_DIR} to g-ir-scanner.
+
+        * PlatformGTK.cmake:
+
</ins><span class="cx"> 2016-01-14  Simon Fraser  &lt;simon.fraser@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Remove workaround for rdar://problem/23623670
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformGTK.cmake (195154 => 195155)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformGTK.cmake        2016-01-15 23:34:25 UTC (rev 195154)
+++ trunk/Source/WebKit2/PlatformGTK.cmake        2016-01-15 23:42:04 UTC (rev 195155)
</span><span class="lines">@@ -929,6 +929,7 @@
</span><span class="cx">         -DWEBKIT2_COMPILATION
</span><span class="cx">         -I${CMAKE_SOURCE_DIR}/Source
</span><span class="cx">         -I${WEBKIT2_DIR}
</span><ins>+        -I${JAVASCRIPTCORE_DIR}
</ins><span class="cx">         -I${JAVASCRIPTCORE_DIR}/ForwardingHeaders
</span><span class="cx">         -I${DERIVED_SOURCES_DIR}
</span><span class="cx">         -I${DERIVED_SOURCES_WEBKIT2GTK_DIR}
</span><span class="lines">@@ -977,6 +978,7 @@
</span><span class="cx">         -DWEBKIT2_COMPILATION
</span><span class="cx">         -I${CMAKE_SOURCE_DIR}/Source
</span><span class="cx">         -I${WEBKIT2_DIR}
</span><ins>+        -I${JAVASCRIPTCORE_DIR}
</ins><span class="cx">         -I${JAVASCRIPTCORE_DIR}/ForwardingHeaders
</span><span class="cx">         -I${DERIVED_SOURCES_DIR}
</span><span class="cx">         -I${DERIVED_SOURCES_WEBKIT2GTK_DIR}
</span></span></pre>
</div>
</div>

</body>
</html>