pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/vnc Don't define abs() as macro under NetBSD becau...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8463180dcee2
branches:  trunk
changeset: 488567:8463180dcee2
user:      tron <tron%pkgsrc.org@localhost>
date:      Fri Feb 04 09:57:12 2005 +0000

description:
Don't define abs() as macro under NetBSD because it conflicts with the
prototype of abs() in "stdlib.h" after de-__P-ing "stdlib.h".

diffstat:

 net/vnc/distinfo         |   3 ++-
 net/vnc/patches/patch-aj |  13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletions(-)

diffs (31 lines):

diff -r 07323663195a -r 8463180dcee2 net/vnc/distinfo
--- a/net/vnc/distinfo  Fri Feb 04 09:39:29 2005 +0000
+++ b/net/vnc/distinfo  Fri Feb 04 09:57:12 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2002/10/23 18:16:58 bouyer Exp $
+$NetBSD: distinfo,v 1.7 2005/02/04 09:57:12 tron Exp $
 
 SHA1 (vnc-3.3.3r2_unixsrc.tgz) = 98e9d2e2c2d0f4f9cb9cafee22d21a868189b176
 Size (vnc-3.3.3r2_unixsrc.tgz) = 2072772 bytes
@@ -15,3 +15,4 @@
 SHA1 (patch-ag) = 89ce8a6ac8d51ffd4d4be4588e59b7dd53366716
 SHA1 (patch-ah) = 0f9f3f3c9b167a2743e8dab2df430b0526346867
 SHA1 (patch-ai) = 0e8e49a44fbe2cf8f371a1224e0064b7cb28597c
+SHA1 (patch-aj) = 3999e7514907d722d4884adcb245022b80d7182b
diff -r 07323663195a -r 8463180dcee2 net/vnc/patches/patch-aj
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/vnc/patches/patch-aj  Fri Feb 04 09:57:12 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2005/02/04 09:57:12 tron Exp $
+
+--- Xvnc/programs/Xserver/include/misc.h.orig  1996-12-23 07:09:29.000000000 +0000
++++ Xvnc/programs/Xserver/include/misc.h       2005-02-04 09:51:52.000000000 +0000
+@@ -159,7 +159,7 @@
+ #define min(a, b) (((a) < (b)) ? (a) : (b))
+ #define max(a, b) (((a) > (b)) ? (a) : (b))
+ #if !defined(AMOEBA) && !defined(__EMX__)
+-#ifndef abs
++#if !defined(abs) && !defined(__NetBSD__)
+ #define abs(a) ((a) > 0 ? (a) : -(a))
+ #endif
+ #else /* AMOEBA || __EMX__ */



Home | Main Index | Thread Index | Old Index