mesa: Branch 'master' - 2 commits

[Brian Paul]

 src/mesa/drivers/x11/xm_buffer.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

New commits:
diff-tree 46fe0087780ccc490c1fcb93453a5abe507668ee (from parents)
Merge: 47e0b606a85059ff29fe311dc2f1bcafdefe4cdb a6cc9ab493a2efa9a0ea91cddba0e85c8c8c83f1
Author: Brian <brian at yutani.localnet.net>
Date:   Wed Mar 14 12:43:26 2007 -0600

    Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa

diff-tree 47e0b606a85059ff29fe311dc2f1bcafdefe4cdb (from 17fb7821d7cdc0ed211eaef013ee7798619a61d3)
Author: Brian <brian at yutani.localnet.net>
Date:   Wed Mar 14 12:42:30 2007 -0600

    move CLIENT_ID code in xmesa_delete_framebuffer(), see bug 7205

diff --git a/src/mesa/drivers/x11/xm_buffer.c b/src/mesa/drivers/x11/xm_buffer.c
index 747971a..73c46b1 100644
--- a/src/mesa/drivers/x11/xm_buffer.c
+++ b/src/mesa/drivers/x11/xm_buffer.c
@@ -362,16 +362,13 @@ xmesa_delete_framebuffer(struct gl_frame
 {
    XMesaBuffer b = XMESA_BUFFER(fb);
 
-#ifdef XFree86Server
-   int client = 0;
-   if (b->frontxrb->drawable)
-       client = CLIENT_ID(b->frontxrb->drawable->id);
-#endif
-
    if (b->num_alloced > 0) {
       /* If no other buffer uses this X colormap then free the colors. */
       if (!xmesa_find_buffer(b->display, b->cmap, b)) {
 #ifdef XFree86Server
+         int client = 0;
+         if (b->frontxrb->drawable)
+            client = CLIENT_ID(b->frontxrb->drawable->id);
          (void)FreeColors(b->cmap, client,
                           b->num_alloced, b->alloced_colors, 0);
 #else