diff options
| author | tron <tron@pkgsrc.org> | 2010-07-17 19:29:25 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2010-07-17 19:29:25 +0000 |
| commit | 84fac0fcb4ae5210212f2888eb38cfa7182224dd (patch) | |
| tree | d294e26665a9d73c713509e28002279dba5e7f5f /print/poppler/patches | |
| parent | ebb665914e009cebd3e927cbc40518346ea7af12 (diff) | |
| download | pkgsrc-84fac0fcb4ae5210212f2888eb38cfa7182224dd.tar.gz | |
Improve horrible version check to unbreak build under NetBSD 5.1* which
provides both fmin(3) and fmax(3). The build is still broke under
NetBSD 5.0_STABLE built from sources after 2010-03-12. A possible fix
for this case is to upgrade to NetBSD 5.1*.
Diffstat (limited to 'print/poppler/patches')
| -rw-r--r-- | print/poppler/patches/patch-aq | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/print/poppler/patches/patch-aq b/print/poppler/patches/patch-aq index fe91d68772e..97f7152add8 100644 --- a/print/poppler/patches/patch-aq +++ b/print/poppler/patches/patch-aq @@ -1,4 +1,4 @@ -$NetBSD: patch-aq,v 1.3 2010/07/15 12:24:19 obache Exp $ +$NetBSD: patch-aq,v 1.4 2010/07/17 19:29:25 tron Exp $ --- poppler/TextOutputDev.cc.orig 2010-06-08 20:06:31.000000000 +0000 +++ poppler/TextOutputDev.cc @@ -8,7 +8,7 @@ $NetBSD: patch-aq,v 1.3 2010/07/15 12:24:19 obache Exp $ +#if defined(__DragonFly__) || defined(__NetBSD__) +#include <sys/param.h> -+#if !(defined(__DragonFly__) && __DragonFly_version >= 200204) && !(defined(__NetBSD__) && __NetBSD_Version__ >= 599002100) ++#if !(defined(__DragonFly__) && __DragonFly_version >= 200204) && !(defined(__NetBSD__) && (__NetBSD_Version__ >= 599002100 || (__NetBSD_Version__ >= 501000000 && __NetBSD_Version__ < 599000000))) +static double fmax(double x, double y) { if (isnan(x)) return y; if (isnan(y)) return x; return (x > y ? x : y);} +static double fmin(double x, double y) { if (isnan(x)) return y; if (isnan(y)) return x; return (x < y ? x : y);} +#endif |