[cairo-commit] cairo/src cairoint.h,1.206,1.207

Owen Taylor commit at pdx.freedesktop.org
Sat Aug 27 18:46:37 PDT 2005


Committed by: otaylor

Update of /cvs/cairo/cairo/src
In directory gabe:/tmp/cvs-serv19287/src

Modified Files:
	cairoint.h 
Log Message:
2005-08-27  Owen Taylor  <otaylor at redhat.com>

        * src/cairoint.h: Undef MIN/MAX before defining them in case
        some system header happens to define them. (#4196, Christian
        Biesinger)


Index: cairoint.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairoint.h,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -d -r1.206 -r1.207
--- cairoint.h	24 Aug 2005 08:39:56 -0000	1.206
+++ cairoint.h	28 Aug 2005 01:46:34 -0000	1.207
@@ -146,7 +146,10 @@
 # define CAIRO_MUTEX_UNLOCK(name)
 #endif
 
+#undef MIN
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
+
+#undef MAX
 #define MAX(a, b) ((a) > (b) ? (a) : (b))
 
 #ifndef FALSE



More information about the cairo-commit mailing list