diff options
Diffstat (limited to 'wm/metisse/patches')
| -rw-r--r-- | wm/metisse/patches/patch-ae | 10 | ||||
| -rw-r--r-- | wm/metisse/patches/patch-ag | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/wm/metisse/patches/patch-ae b/wm/metisse/patches/patch-ae index 21f3c2b9649..a335007716f 100644 --- a/wm/metisse/patches/patch-ae +++ b/wm/metisse/patches/patch-ae @@ -1,23 +1,25 @@ -$NetBSD: patch-ae,v 1.3 2009/07/24 12:10:18 obache Exp $ +$NetBSD: patch-ae,v 1.4 2010/10/22 17:55:28 drochner Exp $ --- FvwmCompositor/main/LayerManager.cxx.orig 2008-08-25 13:54:44.000000000 +0000 +++ FvwmCompositor/main/LayerManager.cxx -@@ -25,6 +25,20 @@ +@@ -25,6 +25,22 @@ using namespace std; // -------------------------------------------------------------------- +#if defined(__NetBSD__) || defined(__DragonFly__) +static inline double -+fmin(double x, double y) ++xxxfmin(double x, double y) +{ + return (x < y) ? x : y; +} + +static inline double -+fmax(double x, double y) ++xxxfmax(double x, double y) +{ + return (x > y) ? x : y; +} ++#define fmin xxxfmin ++#define fmax xxxfmax +#endif + diff --git a/wm/metisse/patches/patch-ag b/wm/metisse/patches/patch-ag index 573829041e9..e4b0210a2be 100644 --- a/wm/metisse/patches/patch-ag +++ b/wm/metisse/patches/patch-ag @@ -1,23 +1,25 @@ -$NetBSD: patch-ag,v 1.1 2009/07/24 12:10:18 obache Exp $ +$NetBSD: patch-ag,v 1.2 2010/10/22 17:55:28 drochner Exp $ --- FvwmCompositor/renderer/goodies.cxx.orig 2008-06-26 12:32:30.000000000 +0000 +++ FvwmCompositor/renderer/goodies.cxx -@@ -22,6 +22,20 @@ +@@ -22,6 +22,22 @@ #include "FoldablePolygon.H" #include "desktop/MetisseWindow.H" +#if defined(__NetBSD__) || defined(__DragonFly__) +static inline double -+fmin(double x, double y) ++xxxfmin(double x, double y) +{ + return (x < y) ? x : y; +} + +static inline double -+fmax(double x, double y) ++xxxfmax(double x, double y) +{ + return (x > y) ? x : y; +} ++#define fmin xxxfmin ++#define fmax xxxfmax +#endif + void goodies_marcking_feedback( |