From 6a3294658a85b4d0d1894d4f08af68a4cdf31bb0 Mon Sep 17 00:00:00 2001
From: "evan@chromium.org"
 <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
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 <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
---
 app/gfx/gl/gl_context_linux.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app')

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;
   }
 }
 
-- 
cgit v1.1