From 00445c90e17e618ae2ea4cc72da9b91b2b4a5761 Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Fri, 14 Nov 2014 11:56:27 -0800
Subject: XFA: merge patch from issue 726033002

Fixes android build error under stricter compilation modes.

TBR=bo_xu@foxitsoftware.com

Review URL: https://codereview.chromium.org/728943002
---
 core/src/fxge/android/fpf_skiafontmgr.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/src/fxge/android/fpf_skiafontmgr.cpp')

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