From 92b7fa7b48691e95d33bc0580cfad858782622ac Mon Sep 17 00:00:00 2001 From: George Sapountzis Date: Fri, 6 Apr 2007 13:28:39 +0300 Subject: xmesa: use newly added xm_image.[hc] Keep external includes to glxheader.h and xmesa includes to xmesaP.h. Drop the following from xm_image.h: - dix-config.h (comes from glheader.h) - xfree86 includes (come from GL/xmesa_xf86.h) - ifdef __CYGWIN__ (leftover ? xm_api.c has something similar) --- src/mesa/drivers/x11/xm_image.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/mesa/drivers/x11/xm_image.c') diff --git a/src/mesa/drivers/x11/xm_image.c b/src/mesa/drivers/x11/xm_image.c index 6af773f538..b91d5679f9 100644 --- a/src/mesa/drivers/x11/xm_image.c +++ b/src/mesa/drivers/x11/xm_image.c @@ -31,15 +31,14 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * Brian Paul */ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #include - -#include "xf86glx_util.h" #include +#include "glxheader.h" +#include "xmesaP.h" + +#ifdef XFree86Server + #ifdef ROUNDUP #undef ROUNDUP #endif @@ -147,3 +146,5 @@ void XMesaPutImageHelper(ScreenPtr display, (*gc->ops->PutImage)(d, gc, d->depth, dest_x, dest_y, width, height, 0, ZPixmap, src); } + +#endif /* XFree86Server */ -- cgit v1.2.3