commit 101d1a658a614d1e2ec02b1e697f6161291af653
author José Fonseca <jrfonseca@tungstengraphics.com> Wed Jul 23 21:06:01 2008 +0900
committer José Fonseca <jrfonseca@tungstengraphics.com> Thu Jul 24 21:24:10 2008 +0900
tree 1dab9e796d0917fd6b699465086b3b5629024a77
parent fd6865c7e5c3c38c273b8269ff30a1acec469b6f

mesa: Prefix main includes with dir to avoid conflicts.

Some of the headers in src/mesa/main have pretty common names which
easily conflict with third-party code, e.g. config.h

src/mesa/shader/arbprogparse.c

diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c
index ff58335..78cc6aa 100644
--- a/src/mesa/shader/arbprogparse.c
+++ b/src/mesa/shader/arbprogparse.c
@@ -38,9 +38,9 @@
 #include "programopt.h"
 #include "prog_parameter.h"
 #include "prog_statevars.h"
-#include "context.h"
-#include "macros.h"
-#include "mtypes.h"
+#include "main/context.h"
+#include "main/macros.h"
+#include "main/mtypes.h"
 #include "prog_instruction.h"