From 56ba90c35c31c77be3f3249fcf2ecf26f6efc62f Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 14 Nov 2014 11:29:28 -0800 Subject: Fix build warning on android under stricter compilation rules. Error is "converting to non-pointer type 'FX_DWORD'". TBR=bo_xu@foxitsoftware.com Review URL: https://codereview.chromium.org/726033002 --- core/src/fxge/android/fpf_skiafontmgr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/fxge/android/fpf_skiafontmgr.cpp b/core/src/fxge/android/fpf_skiafontmgr.cpp index 4380732eb1..1525293ab2 100644 --- a/core/src/fxge/android/fpf_skiafontmgr.cpp +++ b/core/src/fxge/android/fpf_skiafontmgr.cpp @@ -77,7 +77,7 @@ FX_DWORD FPF_SkiaGetSubstFont(FX_DWORD dwHash) return pItem->dwSubSt; } } - return NULL; + return 0; } static const FPF_SKIAFONTMAP g_SkiaSansFontMap[] = { {0x58c5083, 0xd5b8d10f}, -- cgit v1.2.3