From owner-freebsd-current@freebsd.org Mon May 7 14:16:41 2018 Return-Path: Delivered-To: freebsd-current@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 239FBFB3141 for ; Mon, 7 May 2018 14:16:41 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mailman.ysv.freebsd.org (mailman.ysv.freebsd.org [IPv6:2001:1900:2254:206a::50:5]) by mx1.freebsd.org (Postfix) with ESMTP id 93EE371DD4 for ; Mon, 7 May 2018 14:16:40 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: by mailman.ysv.freebsd.org (Postfix) id 4E792FB3140; Mon, 7 May 2018 14:16:40 +0000 (UTC) Delivered-To: current@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 27843FB313F for ; Mon, 7 May 2018 14:16:40 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-io0-x22a.google.com (mail-io0-x22a.google.com [IPv6:2607:f8b0:4001:c06::22a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A9D4071DB4 for ; Mon, 7 May 2018 14:16:39 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: by mail-io0-x22a.google.com with SMTP id z4-v6so33918258iof.5 for ; Mon, 07 May 2018 07:16:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=9Lm7g7VkbWjPyDmDgUgOiUHVlbAKvUUJefWasIxXfss=; b=GGAYKxOGnaqBP1ekIcOYhJ1PcMSgQp0EVENTPaqvllqw9x0z76BpHlcz/Ywmy0TGuI 5sleGJXHHc/+/2mimw+C7BxPV2gk74Ho6ArKwViBO4tyNUraBmwnOzXm5+UVnX/25oj7 +lCsAKGpwfj2/KmOIiJ7yePl35/4wu1alOqvChmYk+ZEvhY4peUHUvBrBsfu0j9iv99p iNlAZM/zCAW5g8lOUnV5mKVrW10e0d/KPSJKl1kPWoHzr1tVP1CeGRXrfzb2IzPKCudN ZB3qqg/Bc5nPkWajAmwdVU5FrN/n1TyCGF9xDoiQVInYjlQQLSLaeBoTj741T0tVteOU IbCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to:user-agent; bh=9Lm7g7VkbWjPyDmDgUgOiUHVlbAKvUUJefWasIxXfss=; b=Mcxr9lwNSTRTth1Fs2BvcpKwnLi1wlfAafFLCR9Hot5O5kr5vjjXycs1xXm+WFp5rB 5T0v50raqIwYp6OOx0tzDB5YaQdRZrcNbPWy6SQntJP5hqs5K6DDI1lTmskSS8wdqWdA 8vVpEm6KFTfGYOh9LUpII7wn2MlGmg7BooAWmsjIB2FQvKCybIrEQfiXrv06Ef8QlRIp c/iZG9YAaIKBAWaVDC4hZ/kSXqQEoniH+/acd8r+a3vLhw/sUCMESmpcgZY9GVdofWVk 1x0JexGRpUx0N/ERakR+c9TR7oC9eqr4t+WprgBxLHMEAQ+Oi0XjRxsCCw69chGgXbu3 dgCw== X-Gm-Message-State: ALQs6tDKyTd8XvDvOqRVoUKQ4Yv+YYa5s2VQNnIWC9oAD04RiSYnqldg b+qDNZ69uLIKIPuOcbnoetmHig== X-Google-Smtp-Source: AB8JxZoWTvK6i8jreIcUBJvZt0b1Nlq+1AA5VSkcTGCPz7EI4cRYAa2kzmutF6LuCsIR6NBB9cKXYQ== X-Received: by 2002:a6b:1e4d:: with SMTP id e74-v6mr41523443ioe.36.1525702598706; Mon, 07 May 2018 07:16:38 -0700 (PDT) Received: from raichu (toroon0560w-lp130-04-184-145-252-74.dsl.bell.ca. [184.145.252.74]) by smtp.gmail.com with ESMTPSA id p16-v6sm4324751itp.3.2018.05.07.07.16.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 May 2018 07:16:37 -0700 (PDT) Sender: Mark Johnston Date: Mon, 7 May 2018 10:16:36 -0400 From: Mark Johnston To: Michael Butler Cc: FreeBSD Current Subject: Re: conflicting definitions: SVN r333283 et al Message-ID: <20180507141635.GC57279@raichu> References: <37efc4e0-6f47-8cf5-8287-d6cb38b00e77@protected-networks.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <37efc4e0-6f47-8cf5-8287-d6cb38b00e77@protected-networks.net> User-Agent: Mutt/1.9.5 (2018-04-13) 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: Mon, 07 May 2018 14:16:41 -0000 On Mon, May 07, 2018 at 09:18:54AM -0400, Michael Butler wrote: > Recent netdump changes appear to introduced/highlighted conflicting > definitions .. The conflicting definitions in ip_compat.h already existed, and I'm not sure why the netdump import brought them to light. I didn't see this failure when doing build testing, and the CI jobs aren't reporting anything. Is this happening during a buildworld? > Building /usr/obj/usr/src/i386.i386/lib/libsysdecode/ioctl.c > In file included from :70: > In file included from > /usr/obj/usr/src/i386.i386/tmp/usr/include/netinet/netdump/netdump.h:37: > In file included from > /usr/obj/usr/src/i386.i386/tmp/usr/include/net/if.h:48: > /usr/obj/usr/src/i386.i386/tmp/usr/include/sys/socket.h:251:9: warning: > 'AF_INET6' macro redefined [-Wmacro-redefined] > #define AF_INET6 28 /* IPv6 */ > ^ > /usr/obj/usr/src/i386.i386/tmp/usr/include/netinet/ip_compat.h:1467:10: > note: previous definition is here > # define AF_INET6 26 > ^ > In file included from :70: > In file included from > /usr/obj/usr/src/i386.i386/tmp/usr/include/netinet/netdump/netdump.h:37: > /usr/obj/usr/src/i386.i386/tmp/usr/include/net/if.h:58:10: warning: > 'IFNAMSIZ' macro redefined [-Wmacro-redefined] > #define IFNAMSIZ IF_NAMESIZE > ^ > /usr/obj/usr/src/i386.i386/tmp/usr/include/netinet/ip_compat.h:1415:9: > note: previous definition is here > #define IFNAMSIZ 16 > ^ > 2 warnings generated. > > imb >