$OpenBSD: patch-glib_gmacros_h,v 1.4 2005/05/24 21:26:17 marcm Exp $ --- glib/gmacros.h.orig Mon Nov 29 06:50:47 2004 +++ glib/gmacros.h Wed Mar 30 20:41:22 2005 @@ -34,6 +34,7 @@ /* We include stddef.h to get the system's definition of NULL */ #include +#include /* Here we provide G_GNUC_EXTENSION as an alias for __extension__, * where this is valid. This allows for warningless compilation of @@ -150,11 +151,13 @@ #define TRUE (!FALSE) #endif -#undef MAX +#ifndef MAX #define MAX(a, b) (((a) > (b)) ? (a) : (b)) +#endif -#undef MIN +#ifndef MIN #define MIN(a, b) (((a) < (b)) ? (a) : (b)) +#endif #undef ABS #define ABS(a) (((a) < 0) ? -(a) : (a))