[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [158133] branches/safari-537.60-branch
From: lforschler () apple ! com
Date: 2013-10-28 21:43:05
Message-ID: 20131028214305.EE65C3038FF () svn ! webkit ! org
[Download RAW message or body]
[Attachment #2 (text/html)]
<!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>[158133] branches/safari-537.60-branch</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/158133">158133</a></dd> \
<dt>Author</dt> <dd>lforschler@apple.com</dd> <dt>Date</dt> <dd>2013-10-28 14:43:05 \
-0700 (Mon, 28 Oct 2013)</dd> </dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/156302">r156302</a>. \
</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53760branchSourceJavaScriptCoreChangeLog">branches/safari-537.60-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari53760branchSourceJavaScriptCoreconfigh">branches/safari-537.60-branch/Source/JavaScriptCore/config.h</a></li>
<li><a href="#branchessafari53760branchSourceWTFChangeLog">branches/safari-537.60-branch/Source/WTF/ChangeLog</a></li>
<li><a href="#branchessafari53760branchSourceWTFconfigh">branches/safari-537.60-branch/Source/WTF/config.h</a></li>
<li><a href="#branchessafari53760branchSourceWebCoreChangeLog">branches/safari-537.60-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53760branchSourceWebCoreWebCorePrefixh">branches/safari-537.60-branch/Source/WebCore/WebCorePrefix.h</a></li>
<li><a href="#branchessafari53760branchSourceWebCoreconfigh">branches/safari-537.60-branch/Source/WebCore/config.h</a></li>
<li><a href="#branchessafari53760branchSourceWebKitwinChangeLog">branches/safari-537.60-branch/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#branchessafari53760branchSourceWebKitwinWebKitPrefixh">branches/safari-537.60-branch/Source/WebKit/win/WebKitPrefix.h</a></li>
<li><a href="#branchessafari53760branchSourceWebKit2ChangeLog">branches/safari-537.60-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari53760branchSourceWebKit2configh">branches/safari-537.60-branch/Source/WebKit2/config.h</a></li>
<li><a href="#branchessafari53760branchToolsChangeLog">branches/safari-537.60-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari53760branchToolsDumpRenderTreeDumpRenderTreePrefixh">branches/safari-537.60-branch/Tools/DumpRenderTree/DumpRenderTreePrefix.h</a></li>
<li><a href="#branchessafari53760branchToolsDumpRenderTreecgImageDiffCGcpp">branches/safari-537.60-branch/Tools/DumpRenderTree/cg/ImageDiffCG.cpp</a></li>
<li><a href="#branchessafari53760branchToolsDumpRenderTreeconfigh">branches/safari-537.60-branch/Tools/DumpRenderTree/config.h</a></li>
<li><a href="#branchessafari53760branchToolsDumpRenderTreewinImageDiffCairocpp">branches/safari-537.60-branch/Tools/DumpRenderTree/win/ImageDiffCairo.cpp</a></li>
<li><a href="#branchessafari53760branchToolsWebKitTestRunnerWebKitTestRunnerPrefixh"> \
branches/safari-537.60-branch/Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h</a></li>
<li><a href="#branchessafari53760branchToolsWebKitTestRunnerconfigh">branches/safari-537.60-branch/Tools/WebKitTestRunner/config.h</a></li>
<li><a href="#branchessafari53760branchWebKitLibrariesChangeLog">branches/safari-537.60-branch/WebKitLibraries/ChangeLog</a></li>
<li><a href="#branchessafari53760branchWebKitLibrarieswintoolsvspropscommonprops">bra \
nches/safari-537.60-branch/WebKitLibraries/win/tools/vsprops/common.props</a></li> \
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53760branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: \
branches/safari-537.60-branch/Source/JavaScriptCore/ChangeLog (158132 => 158133)</h4> \
<pre class="diff"><span> <span class="info">--- \
branches/safari-537.60-branch/Source/JavaScriptCore/ChangeLog 2013-10-28 21:32:59 UTC \
(rev 158132)
+++ branches/safari-537.60-branch/Source/JavaScriptCore/ChangeLog 2013-10-28 21:43:05 \
UTC (rev 158133) </span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2013-10-28 Lucas Forschler <lforschler@apple.com>
+
+ Merge r156302
+
+ 2013-09-23 Patrick Gansterer <paroga@webkit.org>
+
+ use NOMINMAX instead of #define min min
+ https://bugs.webkit.org/show_bug.cgi?id=73563
+
+ Reviewed by Brent Fulgham.
+
+ Use NOMINMAX instead of #define min/max as a cleaner
+ way of ensuring that Windows system header files don't
+ define min/max as macro in the first place.
+
+ * config.h:
+
</ins><span class="cx"> 2013-08-08 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r153819
</span></span></pre></div>
<a id="branchessafari53760branchSourceJavaScriptCoreconfigh"></a>
<div class="modfile"><h4>Modified: \
branches/safari-537.60-branch/Source/JavaScriptCore/config.h (158132 => 158133)</h4> \
<pre class="diff"><span> <span class="info">--- \
branches/safari-537.60-branch/Source/JavaScriptCore/config.h 2013-10-28 21:32:59 UTC \
(rev 158132)
+++ branches/safari-537.60-branch/Source/JavaScriptCore/config.h 2013-10-28 21:43:05 \
UTC (rev 158133) </span><span class="lines">@@ -43,11 +43,6 @@
</span><span class="cx"> #define WINVER 0x0502
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-// If we don't define these, they get defined in windef.h.
-// We want to use std::min and std::max
-#define max max
-#define min min
-
</del><span class="cx"> #if !COMPILER(MSVC7_OR_LOWER) && !OS(WINCE)
</span><span class="cx"> // We need to define this before the first #include of \
stdlib.h or it won't contain rand_s. </span><span class="cx"> #ifndef _CRT_RAND_S
</span></span></pre></div>
<a id="branchessafari53760branchSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.60-branch/Source/WTF/ChangeLog \
(158132 => 158133)</h4> <pre class="diff"><span>
<span class="info">--- branches/safari-537.60-branch/Source/WTF/ChangeLog 2013-10-28 \
21:32:59 UTC (rev 158132)
+++ branches/safari-537.60-branch/Source/WTF/ChangeLog 2013-10-28 21:43:05 UTC (rev \
158133) </span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2013-10-28 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r156302
+
+ 2013-09-23 Patrick Gansterer <paroga@webkit.org>
+
+ use NOMINMAX instead of #define min min
+ https://bugs.webkit.org/show_bug.cgi?id=73563
+
+ Reviewed by Brent Fulgham.
+
+ Use NOMINMAX instead of #define min/max as a cleaner
+ way of ensuring that Windows system header files don't
+ define min/max as macro in the first place.
+
+ * config.h:
+
+2013-10-28 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r156933
</span><span class="cx">
</span><span class="cx"> 2013-10-04 Brent Fulgham <bfulgham@apple.com>
</span></span></pre></div>
<a id="branchessafari53760branchSourceWTFconfigh"></a>
<div class="modfile"><h4>Modified: branches/safari-537.60-branch/Source/WTF/config.h \
(158132 => 158133)</h4> <pre class="diff"><span>
<span class="info">--- branches/safari-537.60-branch/Source/WTF/config.h 2013-10-28 \
21:32:59 UTC (rev 158132)
+++ branches/safari-537.60-branch/Source/WTF/config.h 2013-10-28 21:43:05 UTC (rev \
158133) </span><span class="lines">@@ -40,11 +40,6 @@
</span><span class="cx"> #define WINVER 0x0502
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-// If we don't define these, they get defined in windef.h.
-// We want to use std::min and std::max
-#define max max
-#define min min
-
</del><span class="cx"> #if !COMPILER(MSVC7_OR_LOWER) && !OS(WINCE)
</span><span class="cx"> // We need to define this before the first #include of \
stdlib.h or it won't contain rand_s. </span><span class="cx"> #ifndef _CRT_RAND_S
</span></span></pre></div>
<a id="branchessafari53760branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: \
branches/safari-537.60-branch/Source/WebCore/ChangeLog (158132 => 158133)</h4> <pre \
class="diff"><span> <span class="info">--- \
branches/safari-537.60-branch/Source/WebCore/ChangeLog 2013-10-28 21:32:59 UTC (rev \
158132)
+++ branches/safari-537.60-branch/Source/WebCore/ChangeLog 2013-10-28 21:43:05 UTC \
(rev 158133) </span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2013-10-28 Lucas Forschler <lforschler@apple.com>
+
+ Merge r156302
+
+ 2013-09-23 Patrick Gansterer <paroga@webkit.org>
+
+ use NOMINMAX instead of #define min min
+ https://bugs.webkit.org/show_bug.cgi?id=73563
+
+ Reviewed by Brent Fulgham.
+
+ Use NOMINMAX instead of #define min/max as a cleaner
+ way of ensuring that Windows system header files don't
+ define min/max as macro in the first place.
+
+ * WebCorePrefix.h:
+ * config.h:
+
</ins><span class="cx"> 2013-09-26 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r156416
</span></span></pre></div>
<a id="branchessafari53760branchSourceWebCoreWebCorePrefixh"></a>
<div class="modfile"><h4>Modified: \
branches/safari-537.60-branch/Source/WebCore/WebCorePrefix.h (158132 => 158133)</h4> \
<pre class="diff"><span> <span class="info">--- \
branches/safari-537.60-branch/Source/WebCore/WebCorePrefix.h 2013-10-28 21:32:59 UTC \
(rev 158132)
+++ branches/safari-537.60-branch/Source/WebCore/WebCorePrefix.h 2013-10-28 21:43:05 \
UTC (rev 158133) </span><span class="lines">@@ -53,13 +53,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-// If we don't define these, they get defined in windef.h.
-// We want to use std::min and std::max
-#ifdef __cplusplus
-#define max max
-#define min min
-#endif
-
</del><span class="cx"> #else
</span><span class="cx">
</span><span class="cx"> #include <pthread.h>
</span></span></pre></div>
<a id="branchessafari53760branchSourceWebCoreconfigh"></a>
<div class="modfile"><h4>Modified: \
branches/safari-537.60-branch/Source/WebCore/config.h (158132 => 158133)</h4> <pre \
class="diff"><span> <span class="info">--- \
branches/safari-537.60-branch/Source/WebCore/config.h 2013-10-28 21:32:59 UTC (rev \
158132)
+++ branches/safari-537.60-branch/Source/WebCore/config.h 2013-10-28 21:43:05 UTC \
(rev 158133) </span><span class="lines">@@ -56,15 +56,6 @@
</span><span class="cx"> #define WINVER 0x0502
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-// If we don't define these, they get defined in windef.h.
-// We want to use std::min and std::max.
-#ifndef max
-#define max max
-#endif
-#ifndef min
-#define min min
-#endif
-
</del><span class="cx"> // CURL needs winsock, so don't prevent inclusion of it
</span><span class="cx"> #if !USE(CURL)
</span><span class="cx"> #ifndef _WINSOCKAPI_
</span></span></pre></div>
<a id="branchessafari53760branchSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: \
branches/safari-537.60-branch/Source/WebKit/win/ChangeLog (158132 => 158133)</h4> \
<pre class="diff"><span> <span class="info">--- \
branches/safari-537.60-branch/Source/WebKit/win/ChangeLog 2013-10-28 21:32:59 UTC \
(rev 158132)
+++ branches/safari-537.60-branch/Source/WebKit/win/ChangeLog 2013-10-28 21:43:05 UTC \
(rev 158133) </span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2013-10-28 Lucas Forschler <lforschler@apple.com>
+
+ Merge r156302
+
+ 2013-09-23 Patrick Gansterer <paroga@webkit.org>
+
+ use NOMINMAX instead of #define min min
+ https://bugs.webkit.org/show_bug.cgi?id=73563
+
+ Reviewed by Brent Fulgham.
+
+ Use NOMINMAX instead of #define min/max as a cleaner
+ way of ensuring that Windows system header files don't
+ define min/max as macro in the first place.
+
+ * WebKitPrefix.h:
+
</ins><span class="cx"> 2013-09-26 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r156433
</span></span></pre></div>
<a id="branchessafari53760branchSourceWebKitwinWebKitPrefixh"></a>
<div class="modfile"><h4>Modified: \
branches/safari-537.60-branch/Source/WebKit/win/WebKitPrefix.h (158132 => \
158133)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/safari-537.60-branch/Source/WebKit/win/WebKitPrefix.h 2013-10-28 21:32:59 \
UTC (rev 158132)
+++ branches/safari-537.60-branch/Source/WebKit/win/WebKitPrefix.h 2013-10-28 \
21:43:05 UTC (rev 158133) </span><span class="lines">@@ -34,15 +34,6 @@
</span><span class="cx"> #define WINVER 0x0502
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-// If we don't define these, they get defined in windef.h.
-// We want to use std::min and std::max.
-#ifndef max
-#define max max
-#endif
-#ifndef min
-#define min min
-#endif
-
</del><span class="cx"> #ifndef _WINSOCKAPI_
</span><span class="cx"> #define _WINSOCKAPI_ // Prevent inclusion of winsock.h in \
windows.h </span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari53760branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: \
branches/safari-537.60-branch/Source/WebKit2/ChangeLog (158132 => 158133)</h4> <pre \
class="diff"><span> <span class="info">--- \
branches/safari-537.60-branch/Source/WebKit2/ChangeLog 2013-10-28 21:32:59 UTC (rev \
158132)
+++ branches/safari-537.60-branch/Source/WebKit2/ChangeLog 2013-10-28 21:43:05 UTC \
(rev 158133) </span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2013-10-28 Lucas Forschler <lforschler@apple.com>
+
+ Merge r156302
+
+ 2013-09-23 Patrick Gansterer <paroga@webkit.org>
+
+ use NOMINMAX instead of #define min min
+ https://bugs.webkit.org/show_bug.cgi?id=73563
+
+ Reviewed by Brent Fulgham.
+
+ Use NOMINMAX instead of #define min/max as a cleaner
+ way of ensuring that Windows system header files don't
+ define min/max as macro in the first place.
+
+ * config.h:
+
</ins><span class="cx"> 2013-08-09 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r153907
</span></span></pre></div>
<a id="branchessafari53760branchSourceWebKit2configh"></a>
<div class="modfile"><h4>Modified: \
branches/safari-537.60-branch/Source/WebKit2/config.h (158132 => 158133)</h4> <pre \
class="diff"><span> <span class="info">--- \
branches/safari-537.60-branch/Source/WebKit2/config.h 2013-10-28 21:32:59 UTC (rev \
158132)
+++ branches/safari-537.60-branch/Source/WebKit2/config.h 2013-10-28 21:43:05 UTC \
(rev 158133) </span><span class="lines">@@ -65,15 +65,6 @@
</span><span class="cx"> #define WINVER 0x0502
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-/* If we don't define these, they get defined in windef.h. */
-/* We want to use std::min and std::max. */
-#ifndef max
-#define max max
-#endif
-#ifndef min
-#define min min
-#endif
-
</del><span class="cx"> #ifndef _WINSOCKAPI_
</span><span class="cx"> #define _WINSOCKAPI_ /* Prevent inclusion of winsock.h in \
windows.h */ </span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari53760branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.60-branch/Tools/ChangeLog \
(158132 => 158133)</h4> <pre class="diff"><span>
<span class="info">--- branches/safari-537.60-branch/Tools/ChangeLog 2013-10-28 \
21:32:59 UTC (rev 158132)
+++ branches/safari-537.60-branch/Tools/ChangeLog 2013-10-28 21:43:05 UTC (rev \
158133) </span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2013-10-28 Lucas Forschler <lforschler@apple.com>
+
+ Merge r156302
+
+ 2013-09-23 Patrick Gansterer <paroga@webkit.org>
+
+ use NOMINMAX instead of #define min min
+ https://bugs.webkit.org/show_bug.cgi?id=73563
+
+ Reviewed by Brent Fulgham.
+
+ Use NOMINMAX instead of #define min/max as a cleaner
+ way of ensuring that Windows system header files don't
+ define min/max as macro in the first place.
+
+ * DumpRenderTree/DumpRenderTreePrefix.h:
+ * DumpRenderTree/cg/ImageDiffCG.cpp:
+ * DumpRenderTree/config.h:
+ * DumpRenderTree/win/ImageDiffCairo.cpp:
+ * WebKitTestRunner/WebKitTestRunnerPrefix.h:
+ * WebKitTestRunner/config.h:
+
</ins><span class="cx"> 2013-08-15 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r154115
</span></span></pre></div>
<a id="branchessafari53760branchToolsDumpRenderTreeDumpRenderTreePrefixh"></a>
<div class="modfile"><h4>Modified: \
branches/safari-537.60-branch/Tools/DumpRenderTree/DumpRenderTreePrefix.h (158132 => \
158133)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/safari-537.60-branch/Tools/DumpRenderTree/DumpRenderTreePrefix.h 2013-10-28 \
21:32:59 UTC (rev 158132)
+++ branches/safari-537.60-branch/Tools/DumpRenderTree/DumpRenderTreePrefix.h 2013-10-28 \
21:43:05 UTC (rev 158133) </span><span class="lines">@@ -31,12 +31,3 @@
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx">
</span><span class="cx"> #endif
</span><del>-
-#if defined(WIN32) || defined(_WIN32)
-
-// If we don't define these, they get defined in windef.h.
-// We want to use std::min and std::max
-#define max max
-#define min min
-
-#endif
</del></span></pre></div>
<a id="branchessafari53760branchToolsDumpRenderTreecgImageDiffCGcpp"></a>
<div class="modfile"><h4>Modified: \
branches/safari-537.60-branch/Tools/DumpRenderTree/cg/ImageDiffCG.cpp (158132 => \
158133)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/safari-537.60-branch/Tools/DumpRenderTree/cg/ImageDiffCG.cpp 2013-10-28 \
21:32:59 UTC (rev 158132)
+++ branches/safari-537.60-branch/Tools/DumpRenderTree/cg/ImageDiffCG.cpp 2013-10-28 \
21:43:05 UTC (rev 158133) </span><span class="lines">@@ -24,11 +24,6 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \
SUCH DAMAGE. </span><span class="cx"> */
</span><span class="cx">
</span><del>-#if defined(WIN32) || defined(_WIN32)
-#define max max
-#define min min
-#endif
-
</del><span class="cx"> // FIXME: We need to be able to include these defines from a \
config.h somewhere. </span><span class="cx"> #define JS_EXPORT_PRIVATE
</span><span class="cx"> #define WTF_EXPORT_PRIVATE
</span></span></pre></div>
<a id="branchessafari53760branchToolsDumpRenderTreeconfigh"></a>
<div class="modfile"><h4>Modified: \
branches/safari-537.60-branch/Tools/DumpRenderTree/config.h (158132 => 158133)</h4> \
<pre class="diff"><span> <span class="info">--- \
branches/safari-537.60-branch/Tools/DumpRenderTree/config.h 2013-10-28 21:32:59 UTC \
(rev 158132)
+++ branches/safari-537.60-branch/Tools/DumpRenderTree/config.h 2013-10-28 21:43:05 \
UTC (rev 158133) </span><span class="lines">@@ -56,15 +56,6 @@
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(MAC)
</span><span class="cx">
</span><del>-#if OS(WINDOWS)
-// If we don't define these, they get defined in windef.h.
-// We want to use std::min and std::max
-#undef max
-#define max max
-#undef min
-#define min min
-#endif
-
</del><span class="cx"> #if PLATFORM(WIN)
</span><span class="cx"> #define WTF_USE_CF 1
</span><span class="cx"> #if PLATFORM(WIN_CAIRO)
</span></span></pre></div>
<a id="branchessafari53760branchToolsDumpRenderTreewinImageDiffCairocpp"></a>
<div class="modfile"><h4>Modified: \
branches/safari-537.60-branch/Tools/DumpRenderTree/win/ImageDiffCairo.cpp (158132 => \
158133)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/safari-537.60-branch/Tools/DumpRenderTree/win/ImageDiffCairo.cpp 2013-10-28 \
21:32:59 UTC (rev 158132)
+++ branches/safari-537.60-branch/Tools/DumpRenderTree/win/ImageDiffCairo.cpp 2013-10-28 \
21:43:05 UTC (rev 158133) </span><span class="lines">@@ -50,9 +50,6 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><del>-#undef min
-#undef max
-
</del><span class="cx"> static inline float strtof(const char* inputString, char** \
endptr) </span><span class="cx"> {
</span><span class="cx"> return strtod(inputString, endptr);
</span></span></pre></div>
<a id="branchessafari53760branchToolsWebKitTestRunnerWebKitTestRunnerPrefixh"></a>
<div class="modfile"><h4>Modified: \
branches/safari-537.60-branch/Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h (158132 \
=> 158133)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/safari-537.60-branch/Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h 2013-10-28 \
21:32:59 UTC (rev 158132)
+++ branches/safari-537.60-branch/Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h 2013-10-28 \
21:43:05 UTC (rev 158133) </span><span class="lines">@@ -27,13 +27,6 @@
</span><span class="cx"> #include <Cocoa/Cocoa.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if defined(WIN32) || defined(_WIN32)
-// If we don't define these, they get defined in windef.h.
-// We want to use std::min and std::max
-#define max max
-#define min min
-#endif
-
</del><span class="cx"> #if defined(BUILDING_GTK__)
</span><span class="cx"> #include "autotoolsconfig.h"
</span><span class="cx"> #endif /* defined (BUILDING_GTK__) */
</span></span></pre></div>
<a id="branchessafari53760branchToolsWebKitTestRunnerconfigh"></a>
<div class="modfile"><h4>Modified: \
branches/safari-537.60-branch/Tools/WebKitTestRunner/config.h (158132 => 158133)</h4> \
<pre class="diff"><span> <span class="info">--- \
branches/safari-537.60-branch/Tools/WebKitTestRunner/config.h 2013-10-28 21:32:59 UTC \
(rev 158132)
+++ branches/safari-537.60-branch/Tools/WebKitTestRunner/config.h 2013-10-28 21:43:05 \
UTC (rev 158133) </span><span class="lines">@@ -46,15 +46,4 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if OS(WINDOWS)
-/* If we don't define these, they get defined in windef.h. */
-/* We want to use std::min and std::max. */
-#ifndef max
-#define max max
</del><span class="cx"> #endif
</span><del>-#ifndef min
-#define min min
-#endif
-#endif
-
-#endif
</del></span></pre></div>
<a id="branchessafari53760branchWebKitLibrariesChangeLog"></a>
<div class="modfile"><h4>Modified: \
branches/safari-537.60-branch/WebKitLibraries/ChangeLog (158132 => 158133)</h4> <pre \
class="diff"><span> <span class="info">--- \
branches/safari-537.60-branch/WebKitLibraries/ChangeLog 2013-10-28 21:32:59 UTC (rev \
158132)
+++ branches/safari-537.60-branch/WebKitLibraries/ChangeLog 2013-10-28 21:43:05 UTC \
(rev 158133) </span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2013-10-28 Lucas Forschler <lforschler@apple.com>
+
+ Merge r156302
+
+ 2013-09-23 Patrick Gansterer <paroga@webkit.org>
+
+ use NOMINMAX instead of #define min min
+ https://bugs.webkit.org/show_bug.cgi?id=73563
+
+ Reviewed by Brent Fulgham.
+
+ Use NOMINMAX instead of #define min/max as a cleaner
+ way of ensuring that Windows system header files don't
+ define min/max as macro in the first place.
+
+ * win/tools/vsprops/common.props:
+
</ins><span class="cx"> 2013-09-17 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r154390
</span></span></pre></div>
<a id="branchessafari53760branchWebKitLibrarieswintoolsvspropscommonprops"></a>
<div class="modfile"><h4>Modified: \
branches/safari-537.60-branch/WebKitLibraries/win/tools/vsprops/common.props (158132 \
=> 158133)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/safari-537.60-branch/WebKitLibraries/win/tools/vsprops/common.props 2013-10-28 \
21:32:59 UTC (rev 158132)
+++ branches/safari-537.60-branch/WebKitLibraries/win/tools/vsprops/common.props 2013-10-28 \
21:43:05 UTC (rev 158133) </span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> <ItemDefinitionGroup>
</span><span class="cx"> <ClCompile>
</span><span class="cx"> <AdditionalOptions>/bigobj /GS \
%(AdditionalOptions)</AdditionalOptions> </span><del>- \
<PreprocessorDefinitions>_WINDOWS;WINVER=0x502;_CRT_SECURE_CPP_OVERLOAD_STANDARD \
_NAMES=1;_HAS_EXCEPTIONS=0;BUILDING_$(ProjectName);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</del><ins>+ <PreprocessorDefinitions>_WINDOWS;WINVER=0x502;_CRT_SECURE_CP \
P_OVERLOAD_STANDARD_NAMES=1;_HAS_EXCEPTIONS=0;BUILDING_$(ProjectName);NOMINMAX;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ins><span class="cx"> <PreprocessorDefinitions \
Condition="$(Platform)=='Win32'">WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</span><span class="cx"> <PreprocessorDefinitions \
Condition="$(Platform)=='Win64'">x64</PreprocessorDefinitions> \
</span><span class="cx"> \
<ExceptionHandling>false</ExceptionHandling> </span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic