From 56999adb21648d2578ed562269f5a8df6c79aeff Mon Sep 17 00:00:00 2001
From: Dave Airlie <airliedfreedesktop.org>
Date: Sat, 14 Aug 2004 09:08:27 +0000
Subject: [PATCH] bring over build fix from xorg tree

---
 src/mesa/drivers/dri/i915/intel_context.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/mesa/drivers/dri/i915/intel_context.h b/src/mesa/drivers/dri/i915/intel_context.h
index ad14abc3016..839062921ba 100644
--- a/src/mesa/drivers/dri/i915/intel_context.h
+++ b/src/mesa/drivers/dri/i915/intel_context.h
@@ -352,6 +352,7 @@ do {						\
  * From linux kernel i386 header files, copes with odd sizes better
  * than COPY_DWORDS would:
  */
+#ifdef __i386__
 static __inline__ void * __memcpy(void * to, const void * from, size_t n)
 {
    int d0, d1, d2;
@@ -369,6 +370,9 @@ static __inline__ void * __memcpy(void * to, const void * from, size_t n)
       : "memory");
    return (to);
 }
+#else
+#define __memcpy(a,b,c) memcpy(a,b,c)
+#endif
 
 
 
-- 
2.30.2