diff options
| author | George Sapountzis <gsap7@yahoo.gr> | 2007-04-06 13:28:39 +0300 |
|---|---|---|
| committer | George Sapountzis <gsap7@yahoo.gr> | 2007-04-06 13:28:39 +0300 |
| commit | 92b7fa7b48691e95d33bc0580cfad858782622ac (patch) | |
| tree | dabb447a397f642543e867f0320942cdd17cf5d6 /src/mesa/drivers/x11/xmesaP.h | |
| parent | eb4a8b4bb556524df9a8db066c512385e96d8487 (diff) | |
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)
Diffstat (limited to 'src/mesa/drivers/x11/xmesaP.h')
| -rw-r--r-- | src/mesa/drivers/x11/xmesaP.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mesa/drivers/x11/xmesaP.h b/src/mesa/drivers/x11/xmesaP.h index 03acd4ca24..bd5dce1417 100644 --- a/src/mesa/drivers/x11/xmesaP.h +++ b/src/mesa/drivers/x11/xmesaP.h @@ -27,17 +27,15 @@ #define XMESAP_H -#ifdef XFree86Server -# include "xf86glx_util.h" -#elif defined(USE_XSHM) -# include <X11/extensions/XShm.h> -#endif #include "GL/xmesa.h" #include "mtypes.h" #if defined(FX) #include "GL/fxmesa.h" #include "../glide/fxdrv.h" #endif +#ifdef XFree86Server +#include "xm_image.h" +#endif extern _glthread_Mutex _xmesa_lock; |