diff options
| author | George Sapountzis <[email protected]> | 2007-04-06 13:28:39 +0300 |
|---|---|---|
| committer | George Sapountzis <[email protected]> | 2007-04-06 13:28:39 +0300 |
| commit | 92b7fa7b48691e95d33bc0580cfad858782622ac (patch) | |
| tree | dabb447a397f642543e867f0320942cdd17cf5d6 /src/mesa/drivers/x11/xm_image.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/xm_image.h')
| -rw-r--r-- | src/mesa/drivers/x11/xm_image.h | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/src/mesa/drivers/x11/xm_image.h b/src/mesa/drivers/x11/xm_image.h index bb314128d48..c91ab3935eb 100644 --- a/src/mesa/drivers/x11/xm_image.h +++ b/src/mesa/drivers/x11/xm_image.h @@ -31,22 +31,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * Brian Paul <[email protected]> */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - -#ifndef _XF86GLX_UTIL_H_ -#define _XF86GLX_UTIL_H_ - -#ifdef __CYGWIN__ -#undef WIN32 -#undef _WIN32 -#endif - -#include <screenint.h> -#include <pixmap.h> -#include <gc.h> -#include "GL/xmesa.h" +#ifndef _XM_IMAGE_H_ +#define _XM_IMAGE_H_ #define XMESA_USE_PUTPIXEL_MACRO @@ -102,4 +88,4 @@ extern void XMesaPutImageHelper(ScreenPtr display, int dest_x, int dest_y, unsigned int width, unsigned int height); -#endif /* _XF86GLX_UTIL_H_ */ +#endif /* _XM_IMAGE_H_ */ |