$OpenBSD: patch-glib_gmacros_h,v 1.6 2006/05/22 01:39:36 brad Exp $ --- glib/gmacros.h.orig Sun Dec 4 01:41:57 2005 +++ glib/gmacros.h Fri Apr 28 23:41:43 2006 @@ -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 @@ -163,11 +164,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))