summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVinson Lee <vlee@vmware.com>2010-08-15 22:07:04 -0700
committerVinson Lee <vlee@vmware.com>2010-08-15 22:07:04 -0700
commit97590ebeb0800bd1cd41e2f8f64a4984208251c9 (patch)
tree9e8b1270d1baaf23edcd8b1eafa41d331b1ec77f /src
parent5d2d5bf0c7efff46050340f65dba30fd63806963 (diff)
glsl: Clean up header file inclusion in slang_mem.h.
slang_mem.h Remove imports.h. Include glheader.h for GL symbols. slang_label.c Include imports.h now that slang_mem.c does not include it.
Diffstat (limited to 'src')
-rw-r--r--src/mesa/slang/slang_label.c1
-rw-r--r--src/mesa/slang/slang_mem.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/slang/slang_label.c b/src/mesa/slang/slang_label.c
index 24881d5b6e..a161139800 100644
--- a/src/mesa/slang/slang_label.c
+++ b/src/mesa/slang/slang_label.c
@@ -7,6 +7,7 @@
*/
+#include "main/imports.h"
#include "main/mtypes.h"
#include "program/prog_instruction.h"
#include "slang_label.h"
diff --git a/src/mesa/slang/slang_mem.h b/src/mesa/slang/slang_mem.h
index b5bfae2479..0f06df3c0c 100644
--- a/src/mesa/slang/slang_mem.h
+++ b/src/mesa/slang/slang_mem.h
@@ -27,7 +27,7 @@
#define SLANG_MEM_H
-#include "main/imports.h"
+#include "main/glheader.h"
typedef struct slang_mempool_ slang_mempool;