From 462183fe4cb6df6d90632d9e2cee881c8d26b1cb Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Mon, 26 Apr 2004 10:10:22 +0000
Subject: bring over build fixes from stable branch

---
 src/mesa/drivers/dri/i830/i830_texmem.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/mesa/drivers/dri/i830')

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.
  */
-- 
cgit v1.2.3