From: Vinson Lee <vlee@vmware.com>
Date: Sun, 15 Aug 2010 07:59:34 +0000 (-0700)
Subject: glsl: Clean up header file inclusion in slang_label.h.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c4e99500f4be87997e9348d32a452e2f191b0cbf;p=mesa.git

glsl: Clean up header file inclusion in slang_label.h.

Move mtypes.h and prog_instruction.h to slang_label.c.
Remove imports.h.
Include glheader.h from GL symbols.
---

diff --git a/src/mesa/slang/slang_label.c b/src/mesa/slang/slang_label.c
index 8e3a8ebc1aa..24881d5b6e6 100644
--- a/src/mesa/slang/slang_label.c
+++ b/src/mesa/slang/slang_label.c
@@ -7,6 +7,8 @@
  */
 
 
+#include "main/mtypes.h"
+#include "program/prog_instruction.h"
 #include "slang_label.h"
 #include "slang_mem.h"
 
diff --git a/src/mesa/slang/slang_label.h b/src/mesa/slang/slang_label.h
index 4d04df18d25..b0cff3a8e89 100644
--- a/src/mesa/slang/slang_label.h
+++ b/src/mesa/slang/slang_label.h
@@ -1,10 +1,9 @@
 #ifndef SLANG_LABEL_H
 #define SLANG_LABEL_H 1
 
-#include "main/imports.h"
-#include "main/mtypes.h"
-#include "program/prog_instruction.h"
+#include "main/glheader.h"
 
+struct gl_program;
 
 struct slang_label_
 {