summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2015-02-24 17:48:31 -0700
committerBrian Paul <[email protected]>2015-02-26 08:38:39 -0700
commit4f25a180115d6f7a6149ba8285a394e10aa04ef2 (patch)
tree517f2a8104468af371410d813dc6c04c6a76411b
parent538e13d4a13419add6bbcb5b14a69762ffad0818 (diff)
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 <[email protected]> Reviewed-by: Jose Fonseca <[email protected]>
-rw-r--r--src/mesa/main/compiler.h3
-rw-r--r--src/mesa/main/cpuinfo.c2
-rw-r--r--src/mesa/main/imports.h2
-rw-r--r--src/mesa/program/prog_parameter_layout.c2
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 <assert.h>
#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
#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 <stdlib.h>
+#include <string.h>
#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 <[email protected]>
*/
-#include "main/compiler.h"
+#include "main/imports.h"
#include "main/mtypes.h"
#include "prog_parameter.h"
#include "prog_parameter_layout.h"