Title: [198081] trunk/Source
Revision
198081
Author
[email protected]
Date
2016-03-13 12:02:57 -0700 (Sun, 13 Mar 2016)

Log Message

REGRESSION (r198079): Windows build broke because of "%PRId64" format specifier

Source/WebCore:

* platform/network/ParsedContentRange.cpp: Add #include
<wtf/StdLibExtras.h> and remove local definition of "PRId64".

Source/WTF:

This fixes the following build failure in WebCore for Windows:
    C:\Source\WebCore\page\DOMTimer.cpp(396): error C2146: syntax error: missing ')' before identifier 'PRId64' [C:\WebKitBuild\Debug\Source\WebCore\WebCore.vcxproj]
    C:\Source\WebCore\page\DOMTimer.cpp(399): error C2146: syntax error: missing ')' before identifier 'PRId64' [C:\WebKitBuild\Debug\Source\WebCore\WebCore.vcxproj]

* wtf/StdLibExtras.h: Define "PRId64" for Windows here so it may
be shared.  This should fix DOMTimer.cpp after r198079 since it
already includes StdLibExtras.h.

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (198080 => 198081)


--- trunk/Source/WTF/ChangeLog	2016-03-13 15:46:50 UTC (rev 198080)
+++ trunk/Source/WTF/ChangeLog	2016-03-13 19:02:57 UTC (rev 198081)
@@ -1,3 +1,15 @@
+2016-03-13  David Kilzer  <[email protected]>
+
+        REGRESSION (r198079): Windows build broke because of "%PRId64" format specifier
+
+        This fixes the following build failure in WebCore for Windows:
+            C:\Source\WebCore\page\DOMTimer.cpp(396): error C2146: syntax error: missing ')' before identifier 'PRId64' [C:\WebKitBuild\Debug\Source\WebCore\WebCore.vcxproj]
+            C:\Source\WebCore\page\DOMTimer.cpp(399): error C2146: syntax error: missing ')' before identifier 'PRId64' [C:\WebKitBuild\Debug\Source\WebCore\WebCore.vcxproj]
+
+        * wtf/StdLibExtras.h: Define "PRId64" for Windows here so it may
+        be shared.  This should fix DOMTimer.cpp after r198079 since it
+        already includes StdLibExtras.h.
+
 2016-03-11  Youenn Fablet  <[email protected]>
 
         WTF should have a similar function as equalLettersIgnoringASCIICase to match beginning of strings

Modified: trunk/Source/WTF/wtf/StdLibExtras.h (198080 => 198081)


--- trunk/Source/WTF/wtf/StdLibExtras.h	2016-03-13 15:46:50 UTC (rev 198080)
+++ trunk/Source/WTF/wtf/StdLibExtras.h	2016-03-13 19:02:57 UTC (rev 198081)
@@ -70,6 +70,11 @@
 #define STRINGIZE(exp) #exp
 #define STRINGIZE_VALUE_OF(exp) STRINGIZE(exp)
 
+// Make "PRId64" format specifier work for Visual C++ on Windows.
+#if OS(WINDOWS) && !defined(PRId64)
+#define PRId64 "lld"
+#endif
+
 /*
  * The reinterpret_cast<Type1*>([pointer to Type2]) expressions - where
  * sizeof(Type1) > sizeof(Type2) - cause the following warning on ARM with GCC:

Modified: trunk/Source/WebCore/ChangeLog (198080 => 198081)


--- trunk/Source/WebCore/ChangeLog	2016-03-13 15:46:50 UTC (rev 198080)
+++ trunk/Source/WebCore/ChangeLog	2016-03-13 19:02:57 UTC (rev 198081)
@@ -1,3 +1,10 @@
+2016-03-13  David Kilzer  <[email protected]>
+
+        REGRESSION (r198079): Windows build broke because of "%PRId64" format specifier
+
+        * platform/network/ParsedContentRange.cpp: Add #include
+        <wtf/StdLibExtras.h> and remove local definition of "PRId64".
+
 2016-03-13  Joonghun Park  <[email protected]>
 
         [EFL] Fix debug build error since r197690. Unreviewed.

Modified: trunk/Source/WebCore/platform/network/ParsedContentRange.cpp (198080 => 198081)


--- trunk/Source/WebCore/platform/network/ParsedContentRange.cpp	2016-03-13 15:46:50 UTC (rev 198080)
+++ trunk/Source/WebCore/platform/network/ParsedContentRange.cpp	2016-03-13 19:02:57 UTC (rev 198081)
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "ParsedContentRange.h"
 
+#include <wtf/StdLibExtras.h>
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
@@ -121,10 +122,6 @@
     m_isValid = areContentRangeValuesValid(m_firstBytePosition, m_lastBytePosition, m_instanceLength);
 }
 
-#if OS(WINDOWS) && !defined(PRId64)
-#define PRId64 "lld"
-#endif
-
 String ParsedContentRange::headerValue() const
 {
     if (!m_isValid)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to