summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordeanm@google.com <deanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-18 12:36:07 +0000
committerdeanm@google.com <deanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-18 12:36:07 +0000
commit991702632f6f58bd4a2356107be79edcd1983482 (patch)
treeba407160b4a8632e24b35ef05db944590096c0d2
parentfc7fb6e30c5c3574dfade2803f1793b9110d1370 (diff)
downloadchromium_src-991702632f6f58bd4a2356107be79edcd1983482.zip
chromium_src-991702632f6f58bd4a2356107be79edcd1983482.tar.gz
chromium_src-991702632f6f58bd4a2356107be79edcd1983482.tar.bz2
Return 0 instead of NULL for a non-pointer type. Eliminates a warning in GCC.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@981 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--skia/sgl/SkTypeface_fake.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/skia/sgl/SkTypeface_fake.cpp b/skia/sgl/SkTypeface_fake.cpp
index 2564dd2..6aaf3b0 100644
--- a/skia/sgl/SkTypeface_fake.cpp
+++ b/skia/sgl/SkTypeface_fake.cpp
@@ -4,7 +4,7 @@
uint32_t SkTypeface::UniqueID(const SkTypeface* face)
{
- return NULL;
+ return 0;
}
void SkTypeface::serialize(SkWStream* stream) const {