From 4f25a180115d6f7a6149ba8285a394e10aa04ef2 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 24 Feb 2015 17:48:31 -0700 Subject: [PATCH] mesa: trim down #includes in compiler.h Don't include stuff we don't need. Fix a few #includes elsewhere to keep thing building. Reviewed-by: Matt Turner Reviewed-by: Jose Fonseca --- src/mesa/main/compiler.h | 3 --- src/mesa/main/cpuinfo.c | 2 +- src/mesa/main/imports.h | 2 ++ src/mesa/program/prog_parameter_layout.c | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h index 12c02b2fe51..a700ff9eb23 100644 --- a/src/mesa/main/compiler.h +++ b/src/mesa/main/compiler.h @@ -36,9 +36,6 @@ #include #include -#include -#include -#include #include "util/macros.h" diff --git a/src/mesa/main/cpuinfo.c b/src/mesa/main/cpuinfo.c index 0755d6b21eb..67f22ab9c81 100644 --- a/src/mesa/main/cpuinfo.c +++ b/src/mesa/main/cpuinfo.c @@ -23,7 +23,7 @@ */ -#include "main/compiler.h" +#include "main/imports.h" #include "main/cpuinfo.h" diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h index d8864272e11..2af45a3b254 100644 --- a/src/mesa/main/imports.h +++ b/src/mesa/main/imports.h @@ -36,6 +36,8 @@ #define IMPORTS_H +#include +#include #include "compiler.h" #include "glheader.h" #include "errors.h" diff --git a/src/mesa/program/prog_parameter_layout.c b/src/mesa/program/prog_parameter_layout.c index e83469059c5..282a367ad04 100644 --- a/src/mesa/program/prog_parameter_layout.c +++ b/src/mesa/program/prog_parameter_layout.c @@ -28,7 +28,7 @@ * \author Ian Romanick */ -#include "main/compiler.h" +#include "main/imports.h" #include "main/mtypes.h" #include "prog_parameter.h" #include "prog_parameter_layout.h" -- 2.30.2