Mesa (master): glsl: Clean up header file inclusion in slang_mem.h.

[Vinson Lee]

Module: Mesa
Branch: master
Commit: 97590ebeb0800bd1cd41e2f8f64a4984208251c9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=97590ebeb0800bd1cd41e2f8f64a4984208251c9

Author: Vinson Lee <vlee at vmware.com>
Date:   Sun Aug 15 22:07:04 2010 -0700

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.

---

 src/mesa/slang/slang_label.c |    1 +
 src/mesa/slang/slang_mem.h   |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/mesa/slang/slang_label.c b/src/mesa/slang/slang_label.c
index 24881d5..a161139 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 b5bfae2..0f06df3 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;