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 e76ab5527b0b938529a811189848ad1238b0137a..49d86b3b1f1011e48c51386614a81a6d5b58d169 100644 (file)
--- 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 15e8dffc230ee90fa1682380f9a0f1c8025039c0..f63bddc44d50a623459e5593b855d1d6187cd593 100644 (file)
--- 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 269ff3f8b993bf5a33e11df4aec7bae83ac3f978..9f26c012d66d1775e980c3e1b6d2f00e412de9aa 100644 (file)
--- 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 3a65bb19260d4a44dffb008b764fa655ed558979..4e482bcd54bca6d83a5def82e1b79df6a209d114 100644 (file)
--- 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 04acf05e528397af35b5013e9f7cda9f9db393ce..85d53a860c0214529bb1a48044f8b13ba6a6a9b4 100644 (file)
--- 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 85c394b051f8fc995cb6994598c927b47e09ad2f..3d26feca5bb19ab7d7be5c1f8507a0c401b9293f 100644 (file)
--- 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 fe002082cca7ceb404d297c900130e314f7e911f..9d797cd6ad50bbc891bc39d240cd1ff7fb9557ff 100644 (file)
--- 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 d29af5a5b2faa8cedb1e22d64f0c4a62dd2e76bf..c68105b3951909701065e17c07beea75a9200996 100644 (file)
--- 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 b12b07957cb6730ad5140e4151f7a822b0205db9..1d26fa147ddfb920cb61d480cb144f270cedc94b 100644 (file)
--- 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 6c50f409d29a9b66a3b30637364a0e54bc22d691..fe14ba36b7cf0a65622751bb6d1992568c985d2a 100644 (file)
--- 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 0af8893c30224902bac17138d877c8934af3114e..95a317e99db103f71e319a0a49f825205bf034ab 100644 (file)
--- 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"