summaryrefslogtreecommitdiffstats
path: root/src/mesa/state_tracker/st_texture.c
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/state_tracker/st_texture.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/state_tracker/st_texture.c')
-rw-r--r--src/mesa/state_tracker/st_texture.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_texture.c b/src/mesa/state_tracker/st_texture.c
index 3e5054ecd2d..289b78b38b3 100644
--- a/src/mesa/state_tracker/st_texture.c
+++ b/src/mesa/state_tracker/st_texture.c
@@ -28,7 +28,7 @@
#include "st_context.h"
#include "st_format.h"
#include "st_texture.h"
-#include "enums.h"
+#include "main/enums.h"
#undef Elements /* fix re-defined macro warning */