<!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>[41764] trunk</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/41764">41764</a></dd>
<dt>Author</dt> <dd>kevino@webkit.org</dd>
<dt>Date</dt> <dd>2009-03-17 09:06:35 -0700 (Tue, 17 Mar 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>Reviewed by Mark Rowe.
        
Move BUILDING_ON_* defines into Platform.h to make them available to other ports.
Also tweak the defines so that they work with the default values set by 
AvailabilityMacros.h.

https://bugs.webkit.org/show_bug.cgi?id=24630</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJavaScriptCoreChangeLog">trunk/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkJavaScriptCoreJavaScriptCorePrefixh">trunk/JavaScriptCore/JavaScriptCorePrefix.h</a></li>
<li><a href="#trunkJavaScriptCorewtfPlatformh">trunk/JavaScriptCore/wtf/Platform.h</a></li>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreWebCorePrefixh">trunk/WebCore/WebCorePrefix.h</a></li>
<li><a href="#trunkWebKitmacChangeLog">trunk/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkWebKitmacWebKitPrefixh">trunk/WebKit/mac/WebKitPrefix.h</a></li>
<li><a href="#trunkWebKitToolsChangeLog">trunk/WebKitTools/ChangeLog</a></li>
<li><a href="#trunkWebKitToolsDumpRenderTreemacDumpRenderTreeMach">trunk/WebKitTools/DumpRenderTree/mac/DumpRenderTreeMac.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/ChangeLog (41763 => 41764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/ChangeLog        2009-03-17 15:40:56 UTC (rev 41763)
+++ trunk/JavaScriptCore/ChangeLog        2009-03-17 16:06:35 UTC (rev 41764)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2009-03-17  Kevin Ollivier  &lt;kevino@theolliviers.com&gt;
+
+        Reviewed by Mark Rowe.
+        
+        Move BUILDING_ON_* defines into Platform.h to make them available to other ports.
+        Also tweak the defines so that they work with the default values set by 
+        AvailabilityMacros.h.
+
+        https://bugs.webkit.org/show_bug.cgi?id=24630
+
+        * JavaScriptCorePrefix.h:
+        * wtf/Platform.h:
+
</ins><span class="cx"> 2009-03-15  Simon Fraser  &lt;simon.fraser@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Revert r41718 because it broke DumpRenderTree on Tiger.
</span></span></pre></div>
<a id="trunkJavaScriptCoreJavaScriptCorePrefixh"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/JavaScriptCorePrefix.h (41763 => 41764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/JavaScriptCorePrefix.h        2009-03-17 15:40:56 UTC (rev 41763)
+++ trunk/JavaScriptCore/JavaScriptCorePrefix.h        2009-03-17 16:06:35 UTC (rev 41764)
</span><span class="lines">@@ -25,15 +25,6 @@
</span><span class="cx"> 
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if defined(__APPLE__)
-#import &lt;AvailabilityMacros.h&gt;
-#if MAC_OS_X_VERSION_MAX_ALLOWED &lt;= MAC_OS_X_VERSION_10_4
-#define BUILDING_ON_TIGER 1
-#elif MAC_OS_X_VERSION_MAX_ALLOWED &lt;= MAC_OS_X_VERSION_10_5
-#define BUILDING_ON_LEOPARD 1
-#endif
-#endif
-
</del><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> #define new (&quot;if you use new/delete make sure to include config.h at the top of the file&quot;()) 
</span><span class="cx"> #define delete (&quot;if you use new/delete make sure to include config.h at the top of the file&quot;()) 
</span></span></pre></div>
<a id="trunkJavaScriptCorewtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/wtf/Platform.h (41763 => 41764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/wtf/Platform.h        2009-03-17 15:40:56 UTC (rev 41763)
+++ trunk/JavaScriptCore/wtf/Platform.h        2009-03-17 16:06:35 UTC (rev 41764)
</span><span class="lines">@@ -40,7 +40,13 @@
</span><span class="cx"> /* be used regardless of operating environment */
</span><span class="cx"> #ifdef __APPLE__
</span><span class="cx"> #define WTF_PLATFORM_DARWIN 1
</span><ins>+#include &lt;AvailabilityMacros.h&gt;
+#if !defined(MAC_OS_X_VERSION_10_5) || MAC_OS_X_VERSION_MAX_ALLOWED &lt; MAC_OS_X_VERSION_10_5
+#define BUILDING_ON_TIGER 1
+#elif !defined(MAC_OS_X_VERSION_10_6) || MAC_OS_X_VERSION_MAX_ALLOWED &lt; MAC_OS_X_VERSION_10_6
+#define BUILDING_ON_LEOPARD 1
</ins><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx"> 
</span><span class="cx"> /* PLATFORM(WIN_OS) */
</span><span class="cx"> /* Operating system level dependencies for Windows that should be used */
</span></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (41763 => 41764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-03-17 15:40:56 UTC (rev 41763)
+++ trunk/WebCore/ChangeLog        2009-03-17 16:06:35 UTC (rev 41764)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2009-03-17  Kevin Ollivier  &lt;kevino@theolliviers.com&gt;
+
+        Reviewed by Mark Rowe.
+
+        Get BUILDING_ON_* defines from Platform.h.
+        
+        https://bugs.webkit.org/show_bug.cgi?id=24630
+
+        * WebCorePrefix.h:
+
</ins><span class="cx"> 2009-03-16  Xan Lopez  &lt;xlopez@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Holger Freyther.
</span></span></pre></div>
<a id="trunkWebCoreWebCorePrefixh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/WebCorePrefix.h (41763 => 41764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/WebCorePrefix.h        2009-03-17 15:40:56 UTC (rev 41763)
+++ trunk/WebCore/WebCorePrefix.h        2009-03-17 16:06:35 UTC (rev 41764)
</span><span class="lines">@@ -100,16 +100,6 @@
</span><span class="cx"> #include &lt;CoreFoundation/CoreFoundation.h&gt;
</span><span class="cx"> #include &lt;CoreServices/CoreServices.h&gt;
</span><span class="cx"> 
</span><del>-#include &lt;AvailabilityMacros.h&gt;
-
-#if defined(__APPLE__)
-#if MAC_OS_X_VERSION_MAX_ALLOWED &lt;= MAC_OS_X_VERSION_10_4
-#define BUILDING_ON_TIGER 1
-#elif MAC_OS_X_VERSION_MAX_ALLOWED &lt;= MAC_OS_X_VERSION_10_5
-#define BUILDING_ON_LEOPARD 1
-#endif
-#endif
-
</del><span class="cx"> #ifdef __OBJC__
</span><span class="cx"> #import &lt;Cocoa/Cocoa.h&gt;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/ChangeLog (41763 => 41764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/ChangeLog        2009-03-17 15:40:56 UTC (rev 41763)
+++ trunk/WebKit/mac/ChangeLog        2009-03-17 16:06:35 UTC (rev 41764)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2009-03-17  Kevin Ollivier  &lt;kevino@theolliviers.com&gt;
+
+        Reviewed by Mark Rowe.
+
+        Get BUILDING_ON_* defines from Platform.h.
+        
+        https://bugs.webkit.org/show_bug.cgi?id=24630
+
+        * WebKitPrefix.h:
+
</ins><span class="cx"> 2009-03-16  Darin Adler  &lt;darin@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Dan Bernstein.
</span></span></pre></div>
<a id="trunkWebKitmacWebKitPrefixh"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/mac/WebKitPrefix.h (41763 => 41764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/mac/WebKitPrefix.h        2009-03-17 15:40:56 UTC (rev 41763)
+++ trunk/WebKit/mac/WebKitPrefix.h        2009-03-17 16:06:35 UTC (rev 41764)
</span><span class="lines">@@ -68,21 +68,16 @@
</span><span class="cx"> 
</span><span class="cx"> #ifdef __OBJC__
</span><span class="cx"> #import &lt;Cocoa/Cocoa.h&gt;
</span><del>-#if MAC_OS_X_VERSION_MAX_ALLOWED &lt;= MAC_OS_X_VERSION_10_4
-#define BUILDING_ON_TIGER 1
-#elif MAC_OS_X_VERSION_MAX_ALLOWED &lt;= MAC_OS_X_VERSION_10_5
-#define BUILDING_ON_LEOPARD 1
</del><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx"> 
</span><ins>+#include &lt;wtf/Platform.h&gt;
+
</ins><span class="cx"> #include &quot;EmptyProtocolDefinitions.h&quot;
</span><span class="cx"> 
</span><span class="cx"> #if !defined(BUILDING_ON_LEOPARD) &amp;&amp; !defined(BUILDING_ON_TIGER) &amp;&amp; defined(__x86_64__)
</span><span class="cx"> #define WTF_USE_PLUGIN_HOST_PROCESS 1
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#include &lt;wtf/Platform.h&gt;
-
</del><span class="cx"> /* WebKit has no way to pull settings from WebCore/config.h for now */
</span><span class="cx"> /* so we assume WebKit is always being compiled on top of JavaScriptCore */
</span><span class="cx"> #define WTF_USE_JSC 1
</span></span></pre></div>
<a id="trunkWebKitToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/ChangeLog (41763 => 41764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/ChangeLog        2009-03-17 15:40:56 UTC (rev 41763)
+++ trunk/WebKitTools/ChangeLog        2009-03-17 16:06:35 UTC (rev 41764)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2009-03-17  Kevin Ollivier  &lt;kevino@theolliviers.com&gt;
+
+        Reviewed by Mark Rowe.
+        
+        Tweak the BUILDING_ON_* defines so that they work with the default values set by
+        AvailabilityMacros.h.
+        
+        https://bugs.webkit.org/show_bug.cgi?id=24630
+
+        * DumpRenderTree/mac/DumpRenderTreeMac.h:
+
</ins><span class="cx"> 2009-03-17  Oliver Hunt  &lt;oliver@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Alexey Proskuryakov.
</span></span></pre></div>
<a id="trunkWebKitToolsDumpRenderTreemacDumpRenderTreeMach"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/DumpRenderTree/mac/DumpRenderTreeMac.h (41763 => 41764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/DumpRenderTree/mac/DumpRenderTreeMac.h        2009-03-17 15:40:56 UTC (rev 41763)
+++ trunk/WebKitTools/DumpRenderTree/mac/DumpRenderTreeMac.h        2009-03-17 16:06:35 UTC (rev 41764)
</span><span class="lines">@@ -32,9 +32,9 @@
</span><span class="cx"> // FIXME: we should add a config.h file for DumpRenderTree.
</span><span class="cx"> #define WTF_PLATFORM_CF 1
</span><span class="cx"> 
</span><del>-#if MAC_OS_X_VERSION_MAX_ALLOWED &lt;= MAC_OS_X_VERSION_10_4
</del><ins>+#if !defined(MAC_OS_X_VERSION_10_5) || MAC_OS_X_VERSION_MAX_ALLOWED &lt; MAC_OS_X_VERSION_10_5
</ins><span class="cx"> #define BUILDING_ON_TIGER 1
</span><del>-#elif MAC_OS_X_VERSION_MAX_ALLOWED &lt;= MAC_OS_X_VERSION_10_5
</del><ins>+#elif !defined(MAC_OS_X_VERSION_10_6) || MAC_OS_X_VERSION_MAX_ALLOWED &lt; MAC_OS_X_VERSION_10_6
</ins><span class="cx"> #define BUILDING_ON_LEOPARD 1
</span><span class="cx"> #endif
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>