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 --- webkit/glue/plugins/plugin_instance.cc | 4 ++-- webkit/glue/plugins/webplugin_impl.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'webkit/glue/plugins') diff --git a/webkit/glue/plugins/plugin_instance.cc b/webkit/glue/plugins/plugin_instance.cc index 3cfae8b..8506623 100644 --- a/webkit/glue/plugins/plugin_instance.cc +++ b/webkit/glue/plugins/plugin_instance.cc @@ -263,7 +263,7 @@ int PluginInstance::NPP_WriteReady(NPStream *stream) { if (npp_functions_->writeready != 0) { return npp_functions_->writeready(npp_, stream); } - return NULL; + return 0; } int PluginInstance::NPP_Write(NPStream *stream, @@ -275,7 +275,7 @@ int PluginInstance::NPP_Write(NPStream *stream, if (npp_functions_->write != 0) { return npp_functions_->write(npp_, stream, offset, len, buffer); } - return NULL; + return 0; } void PluginInstance::NPP_StreamAsFile(NPStream *stream, const char *fname) { diff --git a/webkit/glue/plugins/webplugin_impl.cc b/webkit/glue/plugins/webplugin_impl.cc index 9ee98ed..8a0e75e 100644 --- a/webkit/glue/plugins/webplugin_impl.cc +++ b/webkit/glue/plugins/webplugin_impl.cc @@ -412,7 +412,7 @@ WebPluginImpl::WebPluginImpl( WebFrame* webframe, const WebPluginParams& params, const base::WeakPtr& page_delegate) : windowless_(false), - window_(NULL), + window_(0), accepts_input_events_(false), page_delegate_(page_delegate), webframe_(webframe), @@ -473,7 +473,7 @@ void WebPluginImpl::SetWindow(gfx::PluginWindowHandle window) { void WebPluginImpl::WillDestroyWindow(gfx::PluginWindowHandle window) { DCHECK_EQ(window, window_); - window_ = NULL; + window_ = 0; if (page_delegate_) page_delegate_->WillDestroyPluginWindow(window); } -- cgit v1.1