014548031a
Note: this will cause breakage in ports that set the various *_DISABLE_DEPRECATED defines for gtk. These weill be addressed shortly. ok pvalchev@
28 lines
726 B
Plaintext
28 lines
726 B
Plaintext
$OpenBSD: patch-glib_gmacros_h,v 1.3 2004/06/22 03:15:02 marcm Exp $
|
|
--- glib/gmacros.h.orig 2004-03-13 20:30:24.000000000 -0800
|
|
+++ glib/gmacros.h 2004-03-30 22:13:12.000000000 -0800
|
|
@@ -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
|
|
@@ -147,11 +148,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))
|