From 97590ebeb0800bd1cd41e2f8f64a4984208251c9 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Sun, 15 Aug 2010 22:07:04 -0700 Subject: 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 deletion(-) 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; -- cgit v1.2.3