From 99f13343cf270d8dfde8445ae363d9b05256e05b Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 2 Dec 2005 19:41:43 +0000
Subject: Fix two failures encountered when running out of memory during XImage
 allocation. Append \n to _mesa_warning() strings.

---
 src/mesa/drivers/x11/xm_buffer.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/mesa/drivers/x11/xm_buffer.c')

diff --git a/src/mesa/drivers/x11/xm_buffer.c b/src/mesa/drivers/x11/xm_buffer.c
index 64a920da2b..8067b64840 100644
--- a/src/mesa/drivers/x11/xm_buffer.c
+++ b/src/mesa/drivers/x11/xm_buffer.c
@@ -1,6 +1,6 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.3
+ * Version:  6.5
  *
  * Copyright (C) 1999-2005  Brian Paul   All Rights Reserved.
  *
@@ -98,7 +98,8 @@ xmesa_alloc_back_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
       xrb->origin4 = (GLuint *) xrb->ximage->data + xrb->width4 * (height - 1);
    }
    else {
-      assert(xrb->pixmap);
+      /* this assertion will fail if we happend to run out of memory */
+      /*assert(xrb->pixmap);*/
    }
 
    return GL_TRUE;
-- 
cgit v1.2.3