summaryrefslogtreecommitdiffstats
path: root/src/mesa/swrast/s_texcombine.h
diff options
context:
space:
mode:
authorJosé Fonseca <[email protected]>2008-07-23 21:06:01 +0900
committerJosé Fonseca <[email protected]>2008-07-24 21:24:10 +0900
commit101d1a658a614d1e2ec02b1e697f6161291af653 (patch)
tree1dab9e796d0917fd6b699465086b3b5629024a77 /src/mesa/swrast/s_texcombine.h
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_texcombine.h')
-rw-r--r--src/mesa/swrast/s_texcombine.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/swrast/s_texcombine.h b/src/mesa/swrast/s_texcombine.h
index 3bf70e0b86e..20cd2bd8ad1 100644
--- a/src/mesa/swrast/s_texcombine.h
+++ b/src/mesa/swrast/s_texcombine.h
@@ -27,7 +27,7 @@
#define S_TEXCOMBINE_H
-#include "mtypes.h"
+#include "main/mtypes.h"
#include "swrast.h"
extern void