[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.16-1409-g5afdf4d
tkent at chromium.org
tkent at chromium.org
Thu Dec 3 13:38:08 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit 812cf4aed0f3bd38e2277337393c53710ce4fe49
Author: tkent at chromium.org <tkent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 17 06:31:37 2009 +0000
2009-11-16 Kent Tamura <tkent at chromium.org>
Unreviewd build fix.
- Fix typo in WebCore.vcproj.
- Intlude limits.h for INT_MAX.
- Enclose with parenthesis to suspress warning.
* WebCore.vcproj/WebCore.vcproj:
* html/ISODateTime.cpp:
(WebCore::ISODateTime::addDay):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51066 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ac38f4b..4d8c80b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2009-11-16 Kent Tamura <tkent at chromium.org>
+
+ Unreviewd build fix.
+
+ - Fix typo in WebCore.vcproj.
+ - Intlude limits.h for INT_MAX.
+ - Enclose with parenthesis to suspress warning.
+
+ * WebCore.vcproj/WebCore.vcproj:
+ * html/ISODateTime.cpp:
+ (WebCore::ISODateTime::addDay):
+
2009-11-16 Robin Dunn <robin at alldunn.com>
Reviewed by Kevin Ollivier.
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index bc53df9..40b92bd 100644
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -33795,11 +33795,11 @@
>
</File>
<File
- RelativePath="..\html\ISODateParser.cpp"
+ RelativePath="..\html\ISODateTime.cpp"
>
</File>
<File
- RelativePath="..\html\ISODateParser.h"
+ RelativePath="..\html\ISODateTime.h"
>
</File>
<File
diff --git a/WebCore/html/ISODateTime.cpp b/WebCore/html/ISODateTime.cpp
index 3980935..4c28ac0 100644
--- a/WebCore/html/ISODateTime.cpp
+++ b/WebCore/html/ISODateTime.cpp
@@ -31,6 +31,7 @@
#include "config.h"
#include "ISODateTime.h"
+#include <limits.h>
#include <wtf/ASCIICType.h>
namespace WebCore {
@@ -177,8 +178,8 @@ bool ISODateTime::addDay(int dayDiff)
day = maxDayOfMonth(year, month);
}
if (year < gregorianStartYear
- || year == gregorianStartYear && month < gregorianStartMonth
- || year == gregorianStartYear && month == gregorianStartMonth && day < gregorianStartDay)
+ || (year == gregorianStartYear && month < gregorianStartMonth)
+ || (year == gregorianStartYear && month == gregorianStartMonth && day < gregorianStartDay))
return false;
}
m_year = year;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list