From: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon, 5 Nov 2007 09:03:26 +0000 (+0100)
Subject: Fix GLX build of xserver master branch.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=db2ec4502e2518d40c0872335a6b44956a73853a;p=mesa.git

Fix GLX build of xserver master branch.

The internal CreatePixmap API has been extended.
---

diff --git a/include/GL/xmesa_xf86.h b/include/GL/xmesa_xf86.h
index 4d69d4d930d..10f93c3ab62 100644
--- a/include/GL/xmesa_xf86.h
+++ b/include/GL/xmesa_xf86.h
@@ -169,8 +169,13 @@ do { \
 
 
 /* CreatePixmap returns a PixmapPtr; so, it cannot be inside braces */
+#ifdef CREATE_PIXMAP_USAGE_SCRATCH
+#define XMesaCreatePixmap(__d,__b,__w,__h,__depth) \
+  (*__d->CreatePixmap)(__d, __w, __h, __depth, 0)
+#else
 #define XMesaCreatePixmap(__d,__b,__w,__h,__depth) \
     (*__d->CreatePixmap)(__d, __w, __h, __depth)
+#endif
 
 #define XMesaFreePixmap(__d,__b) \
     (*__d->DestroyPixmap)(__b)