From: Vinson Lee <vlee@vmware.com>
Date: Fri, 30 Jul 2010 07:41:08 +0000 (-0700)
Subject: mesa: Include macros.h in files that use symbols from macros.h.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3fdd9fa556e9ba48244cb2b3966d3bfb0b84731b;p=mesa.git

mesa: Include macros.h in files that use symbols from macros.h.

Don't rely on inclusion of other files that already include macros.h.
---

diff --git a/src/mesa/main/clear.c b/src/mesa/main/clear.c
index e76ab5527b0..49d86b3b1f1 100644
--- a/src/mesa/main/clear.c
+++ b/src/mesa/main/clear.c
@@ -35,6 +35,7 @@
 #include "context.h"
 #include "colormac.h"
 #include "enums.h"
+#include "macros.h"
 #include "state.h"
 
 
diff --git a/src/mesa/main/convolve.c b/src/mesa/main/convolve.c
index 15e8dffc230..f63bddc44d5 100644
--- a/src/mesa/main/convolve.c
+++ b/src/mesa/main/convolve.c
@@ -37,6 +37,7 @@
 #include "convolve.h"
 #include "context.h"
 #include "image.h"
+#include "macros.h"
 #include "mtypes.h"
 #include "state.h"
 #include "main/dispatch.h"
diff --git a/src/mesa/main/fog.c b/src/mesa/main/fog.c
index 269ff3f8b99..9f26c012d66 100644
--- a/src/mesa/main/fog.c
+++ b/src/mesa/main/fog.c
@@ -27,6 +27,7 @@
 #include "colormac.h"
 #include "context.h"
 #include "fog.h"
+#include "macros.h"
 #include "mtypes.h"
 
 
diff --git a/src/mesa/main/histogram.c b/src/mesa/main/histogram.c
index 3a65bb19260..4e482bcd54b 100644
--- a/src/mesa/main/histogram.c
+++ b/src/mesa/main/histogram.c
@@ -29,6 +29,7 @@
 #include "context.h"
 #include "image.h"
 #include "histogram.h"
+#include "macros.h"
 #include "main/dispatch.h"
 
 
diff --git a/src/mesa/main/texcompress_fxt1.c b/src/mesa/main/texcompress_fxt1.c
index 04acf05e528..85d53a860c0 100644
--- a/src/mesa/main/texcompress_fxt1.c
+++ b/src/mesa/main/texcompress_fxt1.c
@@ -35,6 +35,7 @@
 #include "context.h"
 #include "convolve.h"
 #include "image.h"
+#include "macros.h"
 #include "mipmap.h"
 #include "texcompress.h"
 #include "texcompress_fxt1.h"
diff --git a/src/mesa/main/texcompress_s3tc.c b/src/mesa/main/texcompress_s3tc.c
index 85c394b051f..3d26feca5bb 100644
--- a/src/mesa/main/texcompress_s3tc.c
+++ b/src/mesa/main/texcompress_s3tc.c
@@ -40,6 +40,7 @@
 #include "convolve.h"
 #include "dlopen.h"
 #include "image.h"
+#include "macros.h"
 #include "texcompress.h"
 #include "texcompress_s3tc.h"
 #include "texstore.h"
diff --git a/src/mesa/main/texfetch.c b/src/mesa/main/texfetch.c
index fe002082cca..9d797cd6ad5 100644
--- a/src/mesa/main/texfetch.c
+++ b/src/mesa/main/texfetch.c
@@ -35,6 +35,7 @@
 
 #include "colormac.h"
 #include "context.h"
+#include "macros.h"
 #include "texcompress.h"
 #include "texcompress_fxt1.h"
 #include "texcompress_s3tc.h"
diff --git a/src/mesa/main/texrender.c b/src/mesa/main/texrender.c
index d29af5a5b2f..c68105b3951 100644
--- a/src/mesa/main/texrender.c
+++ b/src/mesa/main/texrender.c
@@ -1,6 +1,7 @@
 
 #include "context.h"
 #include "colormac.h"
+#include "macros.h"
 #include "texfetch.h"
 #include "texrender.h"
 #include "renderbuffer.h"
diff --git a/src/mesa/math/m_translate.c b/src/mesa/math/m_translate.c
index b12b07957cb..1d26fa147dd 100644
--- a/src/mesa/math/m_translate.c
+++ b/src/mesa/math/m_translate.c
@@ -29,6 +29,7 @@
 
 
 #include "main/glheader.h"
+#include "main/macros.h"
 #include "main/mtypes.h"		/* GLchan hack */
 #include "main/colormac.h"
 
diff --git a/src/mesa/program/prog_execute.c b/src/mesa/program/prog_execute.c
index 6c50f409d29..fe14ba36b7c 100644
--- a/src/mesa/program/prog_execute.c
+++ b/src/mesa/program/prog_execute.c
@@ -38,6 +38,7 @@
 #include "main/glheader.h"
 #include "main/colormac.h"
 #include "main/context.h"
+#include "main/macros.h"
 #include "prog_execute.h"
 #include "prog_instruction.h"
 #include "prog_parameter.h"
diff --git a/src/mesa/vf/vf_generic.c b/src/mesa/vf/vf_generic.c
index 0af8893c302..95a317e99db 100644
--- a/src/mesa/vf/vf_generic.c
+++ b/src/mesa/vf/vf_generic.c
@@ -29,6 +29,7 @@
 #include "main/glheader.h"
 #include "main/context.h"
 #include "main/colormac.h"
+#include "main/macros.h"
 #include "main/simple_list.h"
 
 #include "vf/vf.h"