diff options
| author | craig.schlenter@chromium.org <craig.schlenter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-27 15:45:05 +0000 |
|---|---|---|
| committer | craig.schlenter@chromium.org <craig.schlenter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-27 15:45:05 +0000 |
| commit | 5d7bc9ee7ca6ef8c488683368c95416e31787ae8 (patch) | |
| tree | 45099548b4c8151b1710515e3ba3482cb84e1b30 /app | |
| parent | 5fe9cb560087823043edf4ef43927427aacad54c (diff) | |
| download | chromium_src-5d7bc9ee7ca6ef8c488683368c95416e31787ae8.zip chromium_src-5d7bc9ee7ca6ef8c488683368c95416e31787ae8.tar.gz chromium_src-5d7bc9ee7ca6ef8c488683368c95416e31787ae8.tar.bz2 | |
Linux: Fix some NULL versus 0 issues to appease gcc-4.5.
Patch is 99% the same as spotrh's version (thanks spot!) except
for the use of gfx::kNullPluginWindow in this version.
BUG=49533
Review URL: http://codereview.chromium.org/3014034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53788 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app')
| -rw-r--r-- | app/gfx/gl/gl_context_linux.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/gfx/gl/gl_context_linux.cc b/app/gfx/gl/gl_context_linux.cc index 8701bc3..9e0f4d2 100644 --- a/app/gfx/gl/gl_context_linux.cc +++ b/app/gfx/gl/gl_context_linux.cc @@ -318,7 +318,7 @@ void OSMesaViewGLContext::Destroy() { if (pixmap_) { XFreePixmap(display, pixmap_); - pixmap_ = NULL; + pixmap_ = 0; } if (window_graphics_context_) { @@ -406,7 +406,7 @@ bool OSMesaViewGLContext::UpdateSize() { } if (pixmap_) { XFreePixmap(display, pixmap_); - pixmap_ = NULL; + pixmap_ = 0; } // Recreate a pixmap to hold the frame. |