diff options
| author | José Fonseca <jrfonseca@tungstengraphics.com> | 2008-07-23 21:06:01 +0900 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2008-09-21 10:48:40 -0700 |
| commit | 64dc397d8b6a0b1b87fde0a4f20a57fab2664ef2 (patch) | |
| tree | 273e8fea0512e7bec0013829e8553511285d9501 | |
| parent | 2ea3ef9a80f1759bea8cfe61179fc30fadecea50 (diff) | |
mesa: Prefix main includes with dir to avoid conflicts.
Eliminate a couple of differences with gallium-0.2
| -rw-r--r-- | src/mesa/sparc/sparc.c | 2 | ||||
| -rw-r--r-- | src/mesa/swrast_setup/ss_vb.h | 2 | ||||
| -rw-r--r-- | src/mesa/x86-64/x86-64.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/sparc/sparc.c b/src/mesa/sparc/sparc.c index 1b77b0bb7b..84e8ac6723 100644 --- a/src/mesa/sparc/sparc.c +++ b/src/mesa/sparc/sparc.c @@ -31,7 +31,7 @@ #ifdef USE_SPARC_ASM -#include "context.h" +#include "main/context.h" #include "math/m_xform.h" #include "tnl/t_context.h" diff --git a/src/mesa/swrast_setup/ss_vb.h b/src/mesa/swrast_setup/ss_vb.h index 6ea0cb1a70..2ad1f56f39 100644 --- a/src/mesa/swrast_setup/ss_vb.h +++ b/src/mesa/swrast_setup/ss_vb.h @@ -29,7 +29,7 @@ #ifndef SS_VB_H #define SS_VB_H -#include "mtypes.h" +#include "main/mtypes.h" #include "swrast_setup.h" void _swsetup_vb_init( GLcontext *ctx ); 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" |