[cairo-commit] pixman/src

[Carl Worth]

 pixman/src/icint.h     |    2 ++
 pixman/src/pixregion.c |    2 ++
 2 files changed, 4 insertions(+)

New commits:
diff-tree 0ee64b84689c22bba1d9bb2758170bbc104f5cf1 (from 1b11d3830b26f6ce7f0d8ddcc315a9c19f56658a)
Author: Carl Worth <cworth at cworth.org>
Date:   Tue Jun 13 16:50:43 2006 -0700

    Bug 4196: undef MIN an MAX before defining to avoid duplicate definition

diff --git a/pixman/src/icint.h b/pixman/src/icint.h
index c9b0ab4..e1265eb 100644
--- a/pixman/src/icint.h
+++ b/pixman/src/icint.h
@@ -45,7 +45,9 @@
 #define INLINE
 #endif
 
+#undef MIN
 #define MIN(a,b) ((a) < (b) ? (a) : (b))
+#undef MAX
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
 
 /* C89 has implementation-defined behavior for % with negative operands.
diff --git a/pixman/src/pixregion.c b/pixman/src/pixregion.c
index 38fb1da..b29adf4 100644
--- a/pixman/src/pixregion.c
+++ b/pixman/src/pixregion.c
@@ -69,7 +69,9 @@ SOFTWARE.
 
 #define good(reg) assert(pixman_region16_valid(reg))
 
+#undef MIN
 #define MIN(a,b) ((a) < (b) ? (a) : (b))
+#undef MAX
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
 
 static pixman_box16_t pixman_region_emptyBox = {0, 0, 0, 0};