[SCM] WebKit Debian packaging branch, debian/unstable, updated. 0+svn29752-1-1645-gd3fe478
Mike Hommey
glandium at debian.org
Sat Apr 12 19:56:55 UTC 2008
The following commit has been merged in the debian/unstable branch:
commit 694bbd15cf32aefba9cbc4796915e4ac9a4d1eb7
Author: Mike Hommey <glandium at debian.org>
Date: Sat Apr 12 17:14:40 2008 +0200
Revert what were warning fixes, to avoid diverging too much from upstream
diff --git a/JavaScriptCore/wtf/ASCIICType.h b/JavaScriptCore/wtf/ASCIICType.h
index b58c48a..7d24f0e 100644
--- a/JavaScriptCore/wtf/ASCIICType.h
+++ b/JavaScriptCore/wtf/ASCIICType.h
@@ -50,10 +50,10 @@ namespace WTF {
#endif
inline bool isASCIIAlpha(int c) { return (c | 0x20) >= 'a' && (c | 0x20) <= 'z'; }
- inline bool isASCIIAlphanumeric(char c) { return (c >= '0' && c <= '9') || ((c | 0x20) >= 'a' && (c | 0x20) <= 'z'); }
- inline bool isASCIIAlphanumeric(unsigned short c) { return (c >= '0' && c <= '9') || ((c | 0x20) >= 'a' && (c | 0x20) <= 'z'); }
+ inline bool isASCIIAlphanumeric(char c) { return c >= '0' && c <= '9' || (c | 0x20) >= 'a' && (c | 0x20) <= 'z'; }
+ inline bool isASCIIAlphanumeric(unsigned short c) { return c >= '0' && c <= '9' || (c | 0x20) >= 'a' && (c | 0x20) <= 'z'; }
#if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED)
- inline bool isASCIIAlphanumeric(wchar_t c) { return (c >= '0' && c <= '9') || ((c | 0x20) >= 'a' && (c | 0x20) <= 'z'); }
+ inline bool isASCIIAlphanumeric(wchar_t c) { return c >= '0' && c <= '9' || (c | 0x20) >= 'a' && (c | 0x20) <= 'z'; }
#endif
inline bool isASCIIAlphanumeric(int c) { return c >= '0' && c <= '9' || (c | 0x20) >= 'a' && (c | 0x20) <= 'z'; }
@@ -64,10 +64,10 @@ namespace WTF {
#endif
inline bool isASCIIDigit(int c) { return (c >= '0') & (c <= '9'); }
- inline bool isASCIIHexDigit(char c) { return (c >= '0' && c <= '9') || ((c | 0x20) >= 'a' && (c | 0x20) <= 'f'); }
- inline bool isASCIIHexDigit(unsigned short c) { return (c >= '0' && c <= '9') || ((c | 0x20) >= 'a' && (c | 0x20) <= 'f'); }
+ inline bool isASCIIHexDigit(char c) { return c >= '0' && c <= '9' || (c | 0x20) >= 'a' && (c | 0x20) <= 'f'; }
+ inline bool isASCIIHexDigit(unsigned short c) { return c >= '0' && c <= '9' || (c | 0x20) >= 'a' && (c | 0x20) <= 'f'; }
#if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED)
- inline bool isASCIIHexDigit(wchar_t c) { return (c >= '0' && c <= '9') || ((c | 0x20) >= 'a' && (c | 0x20) <= 'f'); }
+ inline bool isASCIIHexDigit(wchar_t c) { return c >= '0' && c <= '9' || (c | 0x20) >= 'a' && (c | 0x20) <= 'f'; }
#endif
inline bool isASCIIHexDigit(int c) { return c >= '0' && c <= '9' || (c | 0x20) >= 'a' && (c | 0x20) <= 'f'; }
diff --git a/debian/changelog b/debian/changelog
index 2d5b251..6e2596a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ webkit (0~svn31841-1) UNRELEASED; urgency=low
by qmake.
* WebCore/WebCore.pro, WebKit.pro: Revert previous changes, as we don't use
qmake anymore.
+ * JavaScriptCore/wtf/ASCIICType.h: Revert what were warning fixes, to avoid
+ diverging too much from upstream.
-- Mike Hommey <glandium at debian.org> Sat, 12 Apr 2008 11:47:32 +0200
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list