diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2009-01-09 10:40:47 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2009-01-09 14:31:45 +0000 |
| commit | 05f8e41b9567695e9b96276d3ac5734ed2b268a8 (patch) | |
| tree | b92d7091a28673b3b784f2c0b0806c9ce7f35539 /src/gallium/winsys/xlib/xlib_softpipe.c | |
| parent | e3734593aea202e99e77febea7b86c904080939f (diff) | |
xlib: combine and eliminate some header files
Diffstat (limited to 'src/gallium/winsys/xlib/xlib_softpipe.c')
| -rw-r--r-- | src/gallium/winsys/xlib/xlib_softpipe.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gallium/winsys/xlib/xlib_softpipe.c b/src/gallium/winsys/xlib/xlib_softpipe.c index 79722dd72b..f53d8e02f4 100644 --- a/src/gallium/winsys/xlib/xlib_softpipe.c +++ b/src/gallium/winsys/xlib/xlib_softpipe.c @@ -33,8 +33,7 @@ */ -#include "glxheader.h" -#include "xmesaP.h" +#include "xm_api.h" #undef ASSERT #undef Elements @@ -109,7 +108,7 @@ static volatile int mesaXErrorFlag = 0; * Catches potential Xlib errors. */ static int -mesaHandleXError(XMesaDisplay *dpy, XErrorEvent *event) +mesaHandleXError(Display *dpy, XErrorEvent *event) { (void) dpy; (void) event; @@ -154,7 +153,7 @@ alloc_shm_ximage(struct xm_buffer *b, struct xmesa_buffer *xmb, #if 0 GC gc; #endif - int (*old_handler)(XMesaDisplay *, XErrorEvent *); + int (*old_handler)(Display *, XErrorEvent *); b->tempImage = XShmCreateImage(xmb->xm_visual->display, xmb->xm_visual->visinfo->visual, |