summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/i810
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@tungstengraphics.com>2004-04-26 10:10:22 +0000
committerAlan Hourihane <alanh@tungstengraphics.com>2004-04-26 10:10:22 +0000
commit462183fe4cb6df6d90632d9e2cee881c8d26b1cb (patch)
tree0fb5d1c17d80026bec0fe3c2e0449fe30ea9e69e /src/mesa/drivers/dri/i810
parent08fa6de85035c428d77cb88b11a4638b706794b5 (diff)
bring over build fixes from stable branch
Diffstat (limited to 'src/mesa/drivers/dri/i810')
-rw-r--r--src/mesa/drivers/dri/i810/i810texmem.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i810/i810texmem.c b/src/mesa/drivers/dri/i810/i810texmem.c
index 87f535dc23..08900cc67d 100644
--- a/src/mesa/drivers/dri/i810/i810texmem.c
+++ b/src/mesa/drivers/dri/i810/i810texmem.c
@@ -60,6 +60,7 @@ void i810DestroyTexObj(i810ContextPtr imesa, i810TextureObjectPtr t)
+#if defined(i386) || defined(__i386__)
/* From linux kernel i386 header files, copes with odd sizes better
* than COPY_DWORDS would:
*/
@@ -80,6 +81,10 @@ __asm__ __volatile__(
: "memory");
return (to);
}
+#else
+/* Allow compilation on other architectures */
+#define __memcpy memcpy
+#endif
/* Upload an image from mesa's internal copy.
*/