summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDave Airlie <airliedfreedesktop.org>2004-08-14 09:08:27 +0000
committerDave Airlie <airliedfreedesktop.org>2004-08-14 09:08:27 +0000
commit56999adb21648d2578ed562269f5a8df6c79aeff (patch)
tree770f99aba6cfe60fd35cd3f578aa9ec7eadaa65d /src
parentb1872fed15311b439cba386991d435ff7532530a (diff)
bring over build fix from xorg tree
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/dri/i915/intel_context.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i915/intel_context.h b/src/mesa/drivers/dri/i915/intel_context.h
index ad14abc301..839062921b 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