2005-11-13 01:22:02 -05:00
|
|
|
$OpenBSD: patch-glib_gmacros_h,v 1.5 2005/11/13 06:22:03 marcm Exp $
|
|
|
|
|
--- glib/gmacros.h.orig Mon Mar 7 21:41:42 2005
|
|
|
|
|
+++ glib/gmacros.h Tue Aug 23 21:22:07 2005
|
2002-08-07 09:11:53 -04:00
|
|
|
@@ -34,6 +34,7 @@
|
|
|
|
|
/* We include stddef.h to get the system's definition of NULL
|
|
|
|
|
*/
|
|
|
|
|
#include <stddef.h>
|
|
|
|
|
+#include <sys/param.h>
|
|
|
|
|
|
|
|
|
|
/* Here we provide G_GNUC_EXTENSION as an alias for __extension__,
|
|
|
|
|
* where this is valid. This allows for warningless compilation of
|
2005-11-13 01:22:02 -05:00
|
|
|
@@ -156,11 +157,13 @@
|
2002-08-07 09:11:53 -04:00
|
|
|
#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))
|
