From owner-svn-src-projects@FreeBSD.ORG  Thu Jun 14 14:01:54 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 9D9B11065670;
	Thu, 14 Jun 2012 14:01:54 +0000 (UTC)
	(envelope-from davide@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id 899B38FC12;
	Thu, 14 Jun 2012 14:01:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5EE1soq098480;
	Thu, 14 Jun 2012 14:01:54 GMT (envelope-from davide@svn.freebsd.org)
Received: (from davide@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5EE1sfn098478;
	Thu, 14 Jun 2012 14:01:54 GMT (envelope-from davide@svn.freebsd.org)
Message-Id: <201206141401.q5EE1sfn098478@svn.freebsd.org>
From: Davide Italiano <davide@FreeBSD.org>
Date: Thu, 14 Jun 2012 14:01:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237068 - projects/calloutng/lib/libprocstat
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 14 Jun 2012 14:01:54 -0000

Author: davide
Date: Thu Jun 14 14:01:54 2012
New Revision: 237068
URL: http://svn.freebsd.org/changeset/base/237068

Log:
  Fix (or at least, workaround) an include conflict in libprocstat which
  causes buildworld to fail, after my recent changes to sys/sys/_callout.h
  header.
  
  Reviewed by:		stas

Modified:
  projects/calloutng/lib/libprocstat/zfs.c

Modified: projects/calloutng/lib/libprocstat/zfs.c
==============================================================================
--- projects/calloutng/lib/libprocstat/zfs.c	Thu Jun 14 13:55:52 2012	(r237067)
+++ projects/calloutng/lib/libprocstat/zfs.c	Thu Jun 14 14:01:54 2012	(r237068)
@@ -35,6 +35,7 @@
 
 #undef lbolt
 #undef lbolt64
+#undef gethrestime
 #undef gethrestime_sec
 #include <sys/zfs_context.h>
 #include <sys/spa.h>