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 /app/gfx/gl/gl_context_linux.cc | |
| 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 'app/gfx/gl/gl_context_linux.cc')
| -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 a9995d65..d3f8810 100644 --- a/app/gfx/gl/gl_context_linux.cc +++ b/app/gfx/gl/gl_context_linux.cc @@ -58,7 +58,7 @@ class PbufferGLContext : public GLContext { public: explicit PbufferGLContext() : context_(NULL), - pbuffer_(NULL) { + pbuffer_(0) { } // Initializes the GL context. @@ -338,7 +338,7 @@ void PbufferGLContext::Destroy() { if (pbuffer_) { glXDestroyPbuffer(display, pbuffer_); - pbuffer_ = NULL; + pbuffer_ = 0; } } |