svn commit: r312771 - in stable: 10/sys/boot/common 11/sys/boot/common

Dimitry Andric dim at FreeBSD.org
Wed Jan 25 19:16:26 UTC 2017


Author: dim
Date: Wed Jan 25 19:16:24 2017
New Revision: 312771
URL: https://svnweb.freebsd.org/changeset/base/312771

Log:
  MFC r311929:
  
  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())
                                        ^

Modified:
  stable/11/sys/boot/common/reloc_elf.c
Directory Properties:
  stable/11/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/10/sys/boot/common/reloc_elf.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/11/sys/boot/common/reloc_elf.c
==============================================================================
--- stable/11/sys/boot/common/reloc_elf.c	Wed Jan 25 19:04:08 2017	(r312770)
+++ stable/11/sys/boot/common/reloc_elf.c	Wed Jan 25 19:16:24 2017	(r312771)
@@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/types.h>
 #include <machine/elf.h>
 
-#include <errno.h>
 #include <stand.h>
 
 #define FREEBSD_ELF


More information about the svn-src-all mailing list