From 6a3294658a85b4d0d1894d4f08af68a4cdf31bb0 Mon Sep 17 00:00:00 2001 From: "evan@chromium.org" Date: Thu, 6 May 2010 19:22:23 +0000 Subject: Fix NULL vs 0 problems which break the build with -Werror using GCC 4.5 BUG=none TEST=try to compile with gcc 4.5 Patch by Benjamin Jemlich . Review URL: http://codereview.chromium.org/2007003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46601 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/plugin/webplugin_delegate_stub.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chrome/plugin/webplugin_delegate_stub.cc') diff --git a/chrome/plugin/webplugin_delegate_stub.cc b/chrome/plugin/webplugin_delegate_stub.cc index c0de5d2..9b1ec53 100644 --- a/chrome/plugin/webplugin_delegate_stub.cc +++ b/chrome/plugin/webplugin_delegate_stub.cc @@ -158,7 +158,7 @@ void WebPluginDelegateStub::OnInit(const PluginMsg_Init_Params& params, command_line.GetSwitchValue(switches::kPluginPath)); - gfx::PluginWindowHandle parent = NULL; + gfx::PluginWindowHandle parent = 0; #if defined(OS_WIN) parent = gfx::NativeViewFromId(params.containing_window); #elif defined(OS_LINUX) -- cgit v1.1