786222a047
It's the perfect timing to slap it in now during p2k8, and it paves the way for the incoming gtk 2.14.4 upgrade. Tested by bernd@ in a mulk muild. ok ajacoutot@ bernd@ 'go ahead' jasper@
28 lines
705 B
Plaintext
28 lines
705 B
Plaintext
$OpenBSD: patch-glib_gmacros_h,v 1.9 2008/10/27 21:28:01 landry Exp $
|
|
--- glib/gmacros.h.orig Thu Oct 16 16:31:58 2008
|
|
+++ glib/gmacros.h Sat Oct 18 16:46:26 2008
|
|
@@ -38,6 +38,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
|
|
@@ -183,11 +184,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))
|