[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
kbr at google.com
kbr at google.com
Sun Feb 20 23:13:37 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit b6e8e5f0899c28f736b64139626d02576b2e72ec
Author: kbr at google.com <kbr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jan 19 03:23:41 2011 +0000
2011-01-18 Kenneth Russell <kbr at google.com>
Unreviewed, release build fix. Explicitly cast away const.
* src/compiler/preprocessor/scanner.c:
(ScanFromString):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76093 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/ThirdParty/ANGLE/ChangeLog b/Source/ThirdParty/ANGLE/ChangeLog
index e7d8e72..ce20d19 100644
--- a/Source/ThirdParty/ANGLE/ChangeLog
+++ b/Source/ThirdParty/ANGLE/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-18 Kenneth Russell <kbr at google.com>
+
+ Unreviewed, release build fix. Explicitly cast away const.
+
+ * src/compiler/preprocessor/scanner.c:
+ (ScanFromString):
+
2011-01-18 Ben Vanik <ben.vanik at gmail.com>
Reviewed by Kenneth Russell.
diff --git a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/scanner.c b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/scanner.c
index f4bfef9..7b399a0 100644
--- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/scanner.c
+++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/scanner.c
@@ -176,7 +176,7 @@ int ScanFromString(const char *s)
StringInputSrc *in = malloc(sizeof(StringInputSrc));
memset(in, 0, sizeof(StringInputSrc));
- in->p = s;
+ in->p = (char*) s;
in->base.line = 1;
in->base.scan = byte_scan;
in->base.getch = (int (*)(InputSrc *, yystypepp *))str_getch;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list