diff options
| author | Alan Hourihane <alanh@tungstengraphics.com> | 2004-04-26 10:10:22 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@tungstengraphics.com> | 2004-04-26 10:10:22 +0000 |
| commit | 462183fe4cb6df6d90632d9e2cee881c8d26b1cb (patch) | |
| tree | 0fb5d1c17d80026bec0fe3c2e0449fe30ea9e69e /src/mesa/drivers/dri/i830/i830_texmem.c | |
| parent | 08fa6de85035c428d77cb88b11a4638b706794b5 (diff) | |
bring over build fixes from stable branch
Diffstat (limited to 'src/mesa/drivers/dri/i830/i830_texmem.c')
| -rw-r--r-- | src/mesa/drivers/dri/i830/i830_texmem.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i830/i830_texmem.c b/src/mesa/drivers/dri/i830/i830_texmem.c index 6cb5531349..b61ce6f867 100644 --- a/src/mesa/drivers/dri/i830/i830_texmem.c +++ b/src/mesa/drivers/dri/i830/i830_texmem.c @@ -68,6 +68,7 @@ void i830DestroyTexObj(i830ContextPtr imesa, i830TextureObjectPtr t) } } +#if defined(i386) || defined(__i386__) /* From linux kernel i386 header files, copes with odd sizes better * than COPY_DWORDS would: */ @@ -88,7 +89,10 @@ __asm__ __volatile__( : "memory"); return (to); } - +#else +/* Allow compilation on other architectures */ +#define __memcpy memcpy +#endif /* Upload an image from mesa's internal copy. */ |