Index: src/cairoint.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairoint.h,v
retrieving revision 1.202
diff -p -u -6 -r1.202 cairoint.h
--- src/cairoint.h	22 Aug 2005 04:04:52 -0000	1.202
+++ src/cairoint.h	22 Aug 2005 22:56:56 -0000
@@ -143,14 +145,18 @@
 # define CAIRO_MUTEX_DECLARE(name)
 # define CAIRO_MUTEX_DECLARE_GLOBAL(name)
 # define CAIRO_MUTEX_LOCK(name)
 # define CAIRO_MUTEX_UNLOCK(name)
 #endif
 
+#ifndef MIN
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
+#endif
+#ifndef MAX
 #define MAX(a, b) ((a) > (b) ? (a) : (b))
+#endif
 
 #ifndef FALSE
 #define FALSE 0
 #endif
 
 #ifndef TRUE