From owner-svn-ports-head@freebsd.org Thu Jul 26 18:17:31 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5768D10566FD; Thu, 26 Jul 2018 18:17:31 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0D77572E3C; Thu, 26 Jul 2018 18:17:31 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DF6154DC5; Thu, 26 Jul 2018 18:17:30 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6QIHU5R070695; Thu, 26 Jul 2018 18:17:30 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6QIHUX0070694; Thu, 26 Jul 2018 18:17:30 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201807261817.w6QIHUX0070694@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Thu, 26 Jul 2018 18:17:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r475393 - head/net/owamp/files X-SVN-Group: ports-head X-SVN-Commit-Author: pi X-SVN-Commit-Paths: head/net/owamp/files X-SVN-Commit-Revision: 475393 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jul 2018 18:17:31 -0000 Author: pi Date: Thu Jul 26 18:17:30 2018 New Revision: 475393 URL: https://svnweb.freebsd.org/changeset/ports/475393 Log: net/owamp: Unconditionally define a private timespecadd net/owamp assumes that if timespecadd is defined, it's identical to the two-argument version found in the FreeBSD kernel. However, the three argument version found in NetBSD and OpenBSD is actually more common. An upcoming commit to head will replace FreeBSD's version with the NetBSD version. So net/owamp shouldn't assume that if FreeBSD defines timespecadd, it's defining the 2-argument version. PR: 230059 Submitted by: asomers Added: head/net/owamp/files/ head/net/owamp/files/patch-owamp_owamp.h (contents, props changed) Added: head/net/owamp/files/patch-owamp_owamp.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/owamp/files/patch-owamp_owamp.h Thu Jul 26 18:17:30 2018 (r475393) @@ -0,0 +1,49 @@ +--- owamp/owamp.h.orig 2012-03-27 02:23:05 UTC ++++ owamp/owamp.h +@@ -1635,14 +1635,13 @@ OWPTestDiskspace( + #define timespecisset(tvp) ((tvp)->tv_sec || (tvp)->tv_nsec) + #endif + +-#ifndef timespeccmp ++#undef timespeccmp + #define timespeccmp(tvp, uvp, cmp) \ + (((tvp)->tv_sec == (uvp)->tv_sec) ? \ + ((tvp)->tv_nsec cmp (uvp)->tv_nsec) : \ + ((tvp)->tv_sec cmp (uvp)->tv_sec)) +-#endif + +-#ifndef timespecadd ++#undef timespecadd + #define timespecadd(vvp, uvp) \ + do { \ + (vvp)->tv_sec += (uvp)->tv_sec; \ +@@ -1652,9 +1651,8 @@ OWPTestDiskspace( + (vvp)->tv_nsec -= 1000000000; \ + } \ + } while (0) +-#endif + +-#ifndef timespecsub ++#undef timespecsub + #define timespecsub(vvp, uvp) \ + do { \ + (vvp)->tv_sec -= (uvp)->tv_sec; \ +@@ -1664,9 +1662,8 @@ OWPTestDiskspace( + (vvp)->tv_nsec += 1000000000; \ + } \ + } while (0) +-#endif + +-#ifndef timespecdiff ++#undef timespecdiff + #define timespecdiff(vvp,uvp) \ + do { \ + struct timespec ts1_,ts2_; \ +@@ -1680,7 +1677,6 @@ OWPTestDiskspace( + timespecsub(&ts1_,&ts2_); \ + *vvp = ts1_; \ + } while(0) +-#endif + + extern OWPNum64 + OWPGetRTTBound(