summaryrefslogtreecommitdiff
path: root/src/mesa/swrast/s_texstore.c
diff options
context:
space:
mode:
authorJosé Fonseca <jrfonseca@tungstengraphics.com>2008-07-23 21:06:01 +0900
committerJosé Fonseca <jrfonseca@tungstengraphics.com>2008-07-24 21:24:10 +0900
commit101d1a658a614d1e2ec02b1e697f6161291af653 (patch)
tree1dab9e796d0917fd6b699465086b3b5629024a77 /src/mesa/swrast/s_texstore.c
parentfd6865c7e5c3c38c273b8269ff30a1acec469b6f (diff)
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
Diffstat (limited to 'src/mesa/swrast/s_texstore.c')
-rw-r--r--src/mesa/swrast/s_texstore.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/swrast/s_texstore.c b/src/mesa/swrast/s_texstore.c
index 3f49b40d9c..f5d081d7a3 100644
--- a/src/mesa/swrast/s_texstore.c
+++ b/src/mesa/swrast/s_texstore.c
@@ -36,13 +36,13 @@
-#include "glheader.h"
-#include "imports.h"
-#include "colormac.h"
-#include "context.h"
+#include "main/glheader.h"
+#include "main/imports.h"
+#include "main/colormac.h"
+#include "main/context.h"
#include "convolve.h"
#include "image.h"
-#include "macros.h"
+#include "main/macros.h"
#include "mipmap.h"
#include "texformat.h"
#include "teximage.h"