summaryrefslogtreecommitdiff
path: root/src/mesa/x86-64
diff options
context:
space:
mode:
authorJosé Fonseca <jrfonseca@tungstengraphics.com>2008-07-23 21:06:01 +0900
committerKeith Whitwell <keith@tungstengraphics.com>2008-09-21 10:48:40 -0700
commit64dc397d8b6a0b1b87fde0a4f20a57fab2664ef2 (patch)
tree273e8fea0512e7bec0013829e8553511285d9501 /src/mesa/x86-64
parent2ea3ef9a80f1759bea8cfe61179fc30fadecea50 (diff)
mesa: Prefix main includes with dir to avoid conflicts.
Eliminate a couple of differences with gallium-0.2
Diffstat (limited to 'src/mesa/x86-64')
-rw-r--r--src/mesa/x86-64/x86-64.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/x86-64/x86-64.c b/src/mesa/x86-64/x86-64.c
index 09508b66d5..b8b236a545 100644
--- a/src/mesa/x86-64/x86-64.c
+++ b/src/mesa/x86-64/x86-64.c
@@ -31,8 +31,8 @@
#ifdef USE_X86_64_ASM
-#include "glheader.h"
-#include "context.h"
+#include "main/glheader.h"
+#include "main/context.h"
#include "math/m_xform.h"
#include "tnl/t_context.h"
#include "x86-64.h"