Title: [135763] trunk/Source/WebCore
- Revision
- 135763
- Author
- bfulg...@webkit.org
- Date
- 2012-11-26 14:11:42 -0800 (Mon, 26 Nov 2012)
Log Message
clipboardwin compile error for win64
https://bugs.webkit.org/show_bug.cgi?id=94124
Patch by Alex Christensen <alex.christen...@flexsim.com> on 2012-11-26
Reviewed by Brent Fulgham.
The clipboard utilities code uses std::min with one unsigned int parameter and one size_t parameter.
This causes a problem when compiling for 64-bit Windows because the two types are not the same size.
To resolve this issue, we specify the template type as the type the return value is being cast into
Fixed a few compile errors for Windows x64 by specifying template parameters.
* platform/win/ClipboardUtilitiesWin.cpp:
(WebCore::setFileDescriptorData): Specify the types for the std::min macro to avoid compiler errors
under 64-bit builds.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (135762 => 135763)
--- trunk/Source/WebCore/ChangeLog 2012-11-26 22:01:01 UTC (rev 135762)
+++ trunk/Source/WebCore/ChangeLog 2012-11-26 22:11:42 UTC (rev 135763)
@@ -1,3 +1,20 @@
+2012-11-26 Alex Christensen <alex.christen...@flexsim.com>
+
+ clipboardwin compile error for win64
+ https://bugs.webkit.org/show_bug.cgi?id=94124
+
+ Reviewed by Brent Fulgham.
+
+ The clipboard utilities code uses std::min with one unsigned int parameter and one size_t parameter.
+ This causes a problem when compiling for 64-bit Windows because the two types are not the same size.
+ To resolve this issue, we specify the template type as the type the return value is being cast into
+
+ Fixed a few compile errors for Windows x64 by specifying template parameters.
+
+ * platform/win/ClipboardUtilitiesWin.cpp:
+ (WebCore::setFileDescriptorData): Specify the types for the std::min macro to avoid compiler errors
+ under 64-bit builds.
+
2012-11-26 Arnaud Renevier <a.renev...@sisa.samsung.com>
[GTK] GtkSocket is leaked until webview is destroyed.
Modified: trunk/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp (135762 => 135763)
--- trunk/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp 2012-11-26 22:01:01 UTC (rev 135762)
+++ trunk/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp 2012-11-26 22:11:42 UTC (rev 135763)
@@ -433,7 +433,7 @@
fgd->fgd[0].dwFlags = FD_FILESIZE;
fgd->fgd[0].nFileSizeLow = size;
- int maxSize = std::min(pathname.length(), WTF_ARRAY_LENGTH(fgd->fgd[0].cFileName));
+ int maxSize = std::min<int>(pathname.length(), WTF_ARRAY_LENGTH(fgd->fgd[0].cFileName));
CopyMemory(fgd->fgd[0].cFileName, pathname.charactersWithNullTermination(), maxSize * sizeof(UChar));
GlobalUnlock(medium.hGlobal);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
