diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-06 19:22:23 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-06 19:22:23 +0000 |
| commit | 6a3294658a85b4d0d1894d4f08af68a4cdf31bb0 (patch) | |
| tree | 4b921333653c51253153a70fd9af2d29c04a21e3 /webkit | |
| parent | a263d56dd156e94f3453604d231e06a9bb1f537d (diff) | |
| download | chromium_src-6a3294658a85b4d0d1894d4f08af68a4cdf31bb0.zip chromium_src-6a3294658a85b4d0d1894d4f08af68a4cdf31bb0.tar.gz chromium_src-6a3294658a85b4d0d1894d4f08af68a4cdf31bb0.tar.bz2 | |
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 <pcgod99@gmail.com>.
Review URL: http://codereview.chromium.org/2007003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46601 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/plugins/plugin_instance.cc | 4 | ||||
| -rw-r--r-- | webkit/glue/plugins/webplugin_impl.cc | 4 |
2 files changed, 4 insertions, 4 deletions
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<WebPluginPageDelegate>& 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); } |