From a6acc962f76c1eba9dec3ee1646413f6c82ac6e0 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sat, 27 Aug 2005 18:46:34 +0000 Subject: [PATCH] Undef MIN/MAX before defining them in case some system header happens to define them. (#4196, Christian Biesinger) --- ChangeLog | 8 +++++++- src/cairoint.h | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 500d4ad4f..0b9154ee8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,14 @@ +2005-08-27 Owen Taylor + + * src/cairoint.h: Undef MIN/MAX before defining them in case + some system header happens to define them. (#4196, Christian + Biesinger) + 2005-08-27 Owen Taylor * src/cairo-image-surface.c (cairo_image_surface_create) (cairo_image_surface_create_for_data): Fix docs not to talk about - %NULL returns. #4271, Duncan Coutts. + %NULL returns. (#4271, Duncan Coutts.) 2005-08-25 Tor Lillqvist diff --git a/src/cairoint.h b/src/cairoint.h index 346dbe6f4..a43136bea 100644 --- a/src/cairoint.h +++ b/src/cairoint.h @@ -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