[Mesa-dev] [PATCH 5/5] mesa: don't include colormac.h in format code

[Brian Paul]

---
 src/mesa/main/format_pack.py   | 1 -
 src/mesa/main/format_unpack.h  | 2 ++
 src/mesa/main/format_unpack.py | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/format_pack.py b/src/mesa/main/format_pack.py
index f141da8..2f43a30 100644
--- a/src/mesa/main/format_pack.py
+++ b/src/mesa/main/format_pack.py
@@ -43,7 +43,6 @@ string = """/*
 
 #include <stdint.h>
 
-#include "colormac.h"
 #include "format_pack.h"
 #include "format_utils.h"
 #include "macros.h"
diff --git a/src/mesa/main/format_unpack.h b/src/mesa/main/format_unpack.h
index eba3c66..964c607 100644
--- a/src/mesa/main/format_unpack.h
+++ b/src/mesa/main/format_unpack.h
@@ -25,6 +25,8 @@
 #ifndef FORMAT_UNPACK_H
 #define FORMAT_UNPACK_H
 
+#include "formats.h"
+
 extern void
 _mesa_unpack_rgba_row(mesa_format format, GLuint n,
                       const void *src, GLfloat dst[][4]);
diff --git a/src/mesa/main/format_unpack.py b/src/mesa/main/format_unpack.py
index 53bdf64..5928c20 100644
--- a/src/mesa/main/format_unpack.py
+++ b/src/mesa/main/format_unpack.py
@@ -43,7 +43,6 @@ string = """/*
 
 #include <stdint.h>
 
-#include "colormac.h"
 #include "format_unpack.h"
 #include "format_utils.h"
 #include "macros.h"
-- 
1.9.1