From owner-svn-src-all@freebsd.org  Wed Jan 11 18:47:01 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 73C2DCABAA0;
 Wed, 11 Jan 2017 18:47:01 +0000 (UTC) (envelope-from dim@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 mx1.freebsd.org (Postfix) with ESMTPS id 435421F25;
 Wed, 11 Jan 2017 18:47:01 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0BIl0ek013955;
 Wed, 11 Jan 2017 18:47:00 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0BIl0Mg013954;
 Wed, 11 Jan 2017 18:47:00 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201701111847.v0BIl0Mg013954@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 11 Jan 2017 18:47:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r311929 - head/sys/boot/common
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Jan 2017 18:47:01 -0000

Author: dim
Date: Wed Jan 11 18:47:00 2017
New Revision: 311929
URL: https://svnweb.freebsd.org/changeset/base/311929

Log:
  Don't include <errno.h> in reloc_elf.c, as it includes <stand.h> just
  after it, which has a conflicting definition of errno.  This leads to
  the following warning with clang 4.0.0:
  
      In file included from sys/boot/common/reloc_elf32.c:6:
      In file included from sys/boot/common/reloc_elf.c:37:
      /usr/obj/usr/src/tmp/usr/include/stand.h:155:12: error: this function declaration is not a prototype [-Werror,-Wstrict-prototypes]
      extern int errno;
                 ^
      sys/sys/errno.h:46:26: note: expanded from macro 'errno'
      #define errno           (* __error())
                                        ^
  
  MFC after:	3 days

Modified:
  head/sys/boot/common/reloc_elf.c

Modified: head/sys/boot/common/reloc_elf.c
==============================================================================
--- head/sys/boot/common/reloc_elf.c	Wed Jan 11 16:09:25 2017	(r311928)
+++ head/sys/boot/common/reloc_elf.c	Wed Jan 11 18:47:00 2017	(r311929)
@@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/types.h>
 #include <machine/elf.h>
 
-#include <errno.h>
 #include <stand.h>
 
 #define FREEBSD_ELF