From owner-freebsd-current@freebsd.org Sun Dec 31 20:24:22 2017 Return-Path: Delivered-To: freebsd-current@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 58703EA5D75 for ; Sun, 31 Dec 2017 20:24:22 +0000 (UTC) (envelope-from cperciva@freebsd.org) Received: from mail.tarsnap.com (mail.tarsnap.com [54.86.246.204]) by mx1.freebsd.org (Postfix) with ESMTP id 14D482918 for ; Sun, 31 Dec 2017 20:24:21 +0000 (UTC) (envelope-from cperciva@freebsd.org) Received: (qmail 48623 invoked from network); 31 Dec 2017 20:12:50 -0000 Received: from unknown (HELO clamshell.daemonology.net) (127.0.0.1) by ec2-107-20-205-189.compute-1.amazonaws.com with ESMTP; 31 Dec 2017 20:12:50 -0000 Received: (qmail 67579 invoked from network); 31 Dec 2017 20:17:33 -0000 Received: from unknown (HELO clamshell.daemonology.net) (127.0.0.1) by clamshell.daemonology.net with SMTP; 31 Dec 2017 20:17:33 -0000 Subject: Re: SVN r327433 fails to build To: "Herbert J. Skuhra" , freebsd-current@freebsd.org, Michael Butler References: <8a05059f-5ece-7655-f661-4d53ebe760ee@protected-networks.net> <87h8s6kdgj.wl-herbert@gojira.at> From: Colin Percival Message-ID: <53dabd1e-b460-cb78-9279-5c42a441760f@freebsd.org> Date: Sun, 31 Dec 2017 12:17:33 -0800 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 MIME-Version: 1.0 In-Reply-To: <87h8s6kdgj.wl-herbert@gojira.at> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Dec 2017 20:24:22 -0000 On 12/31/17 09:35, Herbert J. Skuhra wrote: > On Sun, 31 Dec 2017 15:19:21 +0100, > Michael Butler wrote: >> >> ===> lib/libprocstat (obj,all,install) >> Building /usr/obj/usr/src/amd64.amd64/lib/libprocstat/zfs/zfs.o >> In file included from /usr/src/lib/libprocstat/zfs.c:41: >> /usr/src/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h:217:9: >> error: 'curthread' macro redefined [-Werror,-Wmacro-redefined] > > This is caused by > > ------------------------------------------------------------------------ > r327429 | cperciva | 2017-12-31 10:23:35 +0100 (Sun, 31 Dec 2017) | 2 lines > > Use the TSLOG framework to record entry/exit timestamps for VFS_MOUNT calls. > > ------------------------------------------------------------------------ Oops! It never occurred to me that I had to worry about userland programs defining _KERNEL and then including kernel headers... I think I know how to fix this, just testing now. Thanks, -- Colin Percival Security Officer Emeritus, FreeBSD | The power to serve Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid