diff options
author | Eric Anholt <eric@anholt.net> | 2008-06-24 14:08:08 -0700 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2008-06-24 14:08:08 -0700 |
commit | f6abe8f0f2fba3073b58b96ed38aae163c765b4a (patch) | |
tree | 706ba29d021fb1e4c54500e8773e3dda5f9ff6e8 /src/mesa/drivers/dri/intel/intel_context.h | |
parent | a42dac187973cbc17be6c59db89264cbc935ab91 (diff) | |
parent | 5174b85a0cb13b06779ea6fc0a8362c9fe57e2ea (diff) |
Merge commit 'origin/master' into drm-gem
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_context.h')
-rw-r--r-- | src/mesa/drivers/dri/intel/intel_context.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_context.h b/src/mesa/drivers/dri/intel/intel_context.h index c314b6e218..f1116d2747 100644 --- a/src/mesa/drivers/dri/intel/intel_context.h +++ b/src/mesa/drivers/dri/intel/intel_context.h @@ -331,7 +331,7 @@ do { \ * XXX Put this in src/mesa/main/imports.h ??? */ #if defined(i386) || defined(__i386__) -static inline void * __memcpy(void * to, const void * from, size_t n) +static INLINE void * __memcpy(void * to, const void * from, size_t n) { int d0, d1, d2; __asm__ __volatile__( |