From owner-p4-projects@FreeBSD.ORG  Wed Mar 19 13:37:07 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C57DA1065684; Wed, 19 Mar 2008 13:37:07 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 83E4C106567B
	for <perforce@freebsd.org>; Wed, 19 Mar 2008 13:37:07 +0000 (UTC)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5C2BA8FC1F
	for <perforce@freebsd.org>; Wed, 19 Mar 2008 13:37:07 +0000 (UTC)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2JDb7PQ048801
	for <perforce@freebsd.org>; Wed, 19 Mar 2008 13:37:07 GMT
	(envelope-from csjp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2JDb7jx048790
	for perforce@freebsd.org; Wed, 19 Mar 2008 13:37:07 GMT
	(envelope-from csjp@freebsd.org)
Date: Wed, 19 Mar 2008 13:37:07 GMT
Message-Id: <200803191337.m2JDb7jx048790@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	csjp@freebsd.org using -f
From: "Christian S.J. Peron" <csjp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 138094 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Mar 2008 13:37:08 -0000

http://perforce.freebsd.org/chv.cgi?CH=138094

Change 138094 by csjp@ibm01 on 2008/03/19 13:37:07

	undefine TSTOMILLI when we no longer require it. This helps a bit with
	namespace pollution.

Affected files ...

.. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#26 edit

Differences ...

==== //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#26 (text+ko) ====

@@ -224,6 +224,7 @@
 	if (p->interrupted && p->to_ms) {
 		expire = TSTOMILLI(&p->firstsel) + p->to_ms;
 		tmout = expire - TSTOMILLI(&cur);
+#undef TSTOMILLI
 		if (tmout <= 0) {
 			p->interrupted = 0;
 			data = pcap_next_zbuf_shm(p, cc);