From 0ee64b84689c22bba1d9bb2758170bbc104f5cf1 Mon Sep 17 00:00:00 2001
From: Carl Worth <cworth@cworth.org>
Date: Tue, 13 Jun 2006 16:50:43 -0700
Subject: [PATCH] Bug 4196: undef MIN an MAX before defining to avoid duplicate
 definition

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

diff --git a/pixman/src/icint.h b/pixman/src/icint.h
index c9b0ab4aa..e1265eb31 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 38fb1da65..b29adf480 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};