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.c | |
| 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.c')
| -rw-r--r-- | src/mesa/drivers/x11/xm_image.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/mesa/drivers/x11/xm_image.c b/src/mesa/drivers/x11/xm_image.c index 6af773f5384..b91d5679f9b 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 <[email protected]> */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - #include <stdlib.h> - -#include "xf86glx_util.h" #include <X11/Xmd.h> +#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 */ |