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 <mattst88@gmail.com>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>

diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h
index 12c02b2fe5110af856f55b7f83699e33a9eaad1a..a700ff9eb2329e2873b87bf69cb804655e594bcb 100644 (file)
--- 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 0755d6b21ebaf58ffdda54907b22bed71f4357e8..67f22ab9c81759fe509c46bc9127d59600792709 100644 (file)
--- 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 d8864272e11be3294f8796928108d70b45673c38..2af45a3b254cb1ecb3a3e6af93f4753cb28066db 100644 (file)
--- 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 e83469059c598a97e71add4bdddbac243889d9d2..282a367ad042ea25c4592316c5315abf412ad1f1 100644 (file)
--- a/src/mesa/program/prog_parameter_layout.c
+++ b/src/mesa/program/prog_parameter_layout.c
@@ -28,7 +28,7 @@
  * \author Ian Romanick <ian.d.romanick@intel.com>
  */
 
-#include "main/compiler.h"
+#include "main/imports.h"
 #include "main/mtypes.h"
 #include "prog_parameter.h"
 #include "prog_parameter_layout.h"