summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorhe <he@pkgsrc.org>2015-11-07 15:51:40 +0000
committerhe <he@pkgsrc.org>2015-11-07 15:51:40 +0000
commit650d984b132742f83c6240c8977698f49fd019f0 (patch)
treeeb420f2adb22089bf6e7411fb9d718a66f8ce2bc /x11
parent62c432454302c69e54d5ec4dbdabeb5d6283dc73 (diff)
downloadpkgsrc-650d984b132742f83c6240c8977698f49fd019f0.tar.gz
Improve compatibility with systems which lack either round(), rint()
or nearbyint(), but might still have them declared in <math.h>. Bump PKGREVISION.
Diffstat (limited to 'x11')
-rw-r--r--x11/gtk3/patches/patch-gtk_fallback-c89.c49
1 files changed, 49 insertions, 0 deletions
diff --git a/x11/gtk3/patches/patch-gtk_fallback-c89.c b/x11/gtk3/patches/patch-gtk_fallback-c89.c
new file mode 100644
index 00000000000..042f51acc22
--- /dev/null
+++ b/x11/gtk3/patches/patch-gtk_fallback-c89.c
@@ -0,0 +1,49 @@
+$NetBSD: patch-gtk_fallback-c89.c,v 1.1 2015/11/07 15:51:40 he Exp $
+
+Work around the fact that math.h may declare these functions
+non-static.
+
+--- gtk/fallback-c89.c.orig 2014-03-06 04:42:58.000000000 +0000
++++ gtk/fallback-c89.c
+@@ -22,19 +22,20 @@
+ /* Workaround for round() for non-GCC/non-C99 compilers */
+ #ifndef HAVE_ROUND
+ static inline double
+-round (double x)
++my_round (double x)
+ {
+ if (x >= 0)
+ return floor (x + 0.5);
+ else
+ return ceil (x - 0.5);
+ }
++#define round(x) my_round(x)
+ #endif
+
+ /* Workaround for rint() for non-GCC/non-C99 compilers */
+ #ifndef HAVE_RINT
+ static inline double
+-rint (double x)
++my_rint (double x)
+ {
+ if (ceil (x + 0.5) == floor (x + 0.5))
+ {
+@@ -53,6 +54,7 @@ rint (double x)
+ return ceil (x - 0.5);
+ }
+ }
++#define rint(x) my_rint(x)
+ #endif
+
+ #ifndef HAVE_NEARBYINT
+@@ -60,8 +62,9 @@ rint (double x)
+ /* This is quite similar to rint() in most respects */
+
+ static inline double
+-nearbyint (double x)
++my_nearbyint (double x)
+ {
+ return floor (x + 0.5);
+ }
++#define nearbyint(x) my_nearbyint(x)
+ #endif