summaryrefslogtreecommitdiff
path: root/wm/metisse/patches/patch-ag
diff options
context:
space:
mode:
Diffstat (limited to 'wm/metisse/patches/patch-ag')
-rw-r--r--wm/metisse/patches/patch-ag13
1 files changed, 7 insertions, 6 deletions
diff --git a/wm/metisse/patches/patch-ag b/wm/metisse/patches/patch-ag
index e4b0210a2be..610c2194adc 100644
--- a/wm/metisse/patches/patch-ag
+++ b/wm/metisse/patches/patch-ag
@@ -1,25 +1,26 @@
-$NetBSD: patch-ag,v 1.2 2010/10/22 17:55:28 drochner Exp $
+$NetBSD: patch-ag,v 1.3 2010/12/27 14:28:39 obache Exp $
--- FvwmCompositor/renderer/goodies.cxx.orig 2008-06-26 12:32:30.000000000 +0000
+++ FvwmCompositor/renderer/goodies.cxx
-@@ -22,6 +22,22 @@
+@@ -22,6 +22,23 @@
#include "FoldablePolygon.H"
#include "desktop/MetisseWindow.H"
+#if defined(__NetBSD__) || defined(__DragonFly__)
++#include <sys/param.h>
++#if !(defined(__DragonFly__) && __DragonFly_version >= 200204) && !(defined(__NetBSD__) && (__NetBSD_Version__ >= 599002100 || (__NetBSD_Version__ >= 501000000 && __NetBSD_Version__ < 599000000)))
+static inline double
-+xxxfmin(double x, double y)
++fmin(double x, double y)
+{
+ return (x < y) ? x : y;
+}
+
+static inline double
-+xxxfmax(double x, double y)
++fmax(double x, double y)
+{
+ return (x > y) ? x : y;
+}
-+#define fmin xxxfmin
-+#define fmax xxxfmax
++#endif
+#endif
+
void goodies_marcking_feedback(