From owner-svn-src-all@freebsd.org Wed Apr 25 01:35:07 2018 Return-Path: Delivered-To: svn-src-all@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 9BFB4FB9FEE; Wed, 25 Apr 2018 01:35:07 +0000 (UTC) (envelope-from benno@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47DCB774F7; Wed, 25 Apr 2018 01:35:07 +0000 (UTC) (envelope-from benno@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4284E22958; Wed, 25 Apr 2018 01:35:07 +0000 (UTC) (envelope-from benno@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3P1Z7J6084507; Wed, 25 Apr 2018 01:35:07 GMT (envelope-from benno@FreeBSD.org) Received: (from benno@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3P1Z6Xt084500; Wed, 25 Apr 2018 01:35:06 GMT (envelope-from benno@FreeBSD.org) Message-Id: <201804250135.w3P1Z6Xt084500@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: benno set sender to benno@FreeBSD.org using -f From: Benno Rice Date: Wed, 25 Apr 2018 01:35:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r332980 - in stable/11/usr.sbin/makefs: . cd9660 ffs X-SVN-Group: stable-11 X-SVN-Commit-Author: benno X-SVN-Commit-Paths: in stable/11/usr.sbin/makefs: . cd9660 ffs X-SVN-Commit-Revision: 332980 X-SVN-Commit-Repository: base 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.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Apr 2018 01:35:07 -0000 Author: benno Date: Wed Apr 25 01:35:06 2018 New Revision: 332980 URL: https://svnweb.freebsd.org/changeset/base/332980 Log: MFC r307927 Be more precise when including headers so that we're less likely to depend on namespace pollution and as such become more portable. This means including headers like or , but also making sure we include system/host headers before local headers. While here: define ENOATTR as ENOMSG in mtree.c. There is no ENOATTR on Linux. With this, makefs is ready for compilation on macOS and Linux. Sponsored by: iXsystems, Inc. Modified: stable/11/usr.sbin/makefs/cd9660.c stable/11/usr.sbin/makefs/cd9660/cd9660_archimedes.c stable/11/usr.sbin/makefs/cd9660/iso9660_rrip.c stable/11/usr.sbin/makefs/ffs/ffs_bswap.c stable/11/usr.sbin/makefs/ffs/ffs_subr.c stable/11/usr.sbin/makefs/mtree.c stable/11/usr.sbin/makefs/walk.c Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.sbin/makefs/cd9660.c ============================================================================== --- stable/11/usr.sbin/makefs/cd9660.c Wed Apr 25 01:30:29 2018 (r332979) +++ stable/11/usr.sbin/makefs/cd9660.c Wed Apr 25 01:35:06 2018 (r332980) @@ -100,10 +100,11 @@ #include __FBSDID("$FreeBSD$"); -#include -#include #include #include +#include +#include +#include #include "makefs.h" #include "cd9660.h" Modified: stable/11/usr.sbin/makefs/cd9660/cd9660_archimedes.c ============================================================================== --- stable/11/usr.sbin/makefs/cd9660/cd9660_archimedes.c Wed Apr 25 01:30:29 2018 (r332979) +++ stable/11/usr.sbin/makefs/cd9660/cd9660_archimedes.c Wed Apr 25 01:35:06 2018 (r332980) @@ -42,9 +42,11 @@ #include __FBSDID("$FreeBSD$"); +#include #include #include #include +#include #include #include "makefs.h" Modified: stable/11/usr.sbin/makefs/cd9660/iso9660_rrip.c ============================================================================== --- stable/11/usr.sbin/makefs/cd9660/iso9660_rrip.c Wed Apr 25 01:30:29 2018 (r332979) +++ stable/11/usr.sbin/makefs/cd9660/iso9660_rrip.c Wed Apr 25 01:35:06 2018 (r332980) @@ -37,14 +37,16 @@ * defined in iso9660_rrip.h */ -#include "makefs.h" -#include "cd9660.h" -#include "iso9660_rrip.h" +#include +__FBSDID("$FreeBSD$"); + #include +#include #include -#include -__FBSDID("$FreeBSD$"); +#include "makefs.h" +#include "cd9660.h" +#include "iso9660_rrip.h" static void cd9660_rrip_initialize_inode(cd9660node *); static int cd9660_susp_handle_continuation(iso9660_disk *, cd9660node *); Modified: stable/11/usr.sbin/makefs/ffs/ffs_bswap.c ============================================================================== --- stable/11/usr.sbin/makefs/ffs/ffs_bswap.c Wed Apr 25 01:30:29 2018 (r332979) +++ stable/11/usr.sbin/makefs/ffs/ffs_bswap.c Wed Apr 25 01:35:06 2018 (r332980) @@ -40,17 +40,18 @@ __FBSDID("$FreeBSD$"); #include #endif -#include -#include "ffs/ufs_bswap.h" -#include - #if !defined(_KERNEL) #include +#include #include #include #include #define panic(x) printf("%s\n", (x)), abort() #endif + +#include +#include "ffs/ufs_bswap.h" +#include #define fs_old_postbloff fs_spare5[0] #define fs_old_rotbloff fs_spare5[1] Modified: stable/11/usr.sbin/makefs/ffs/ffs_subr.c ============================================================================== --- stable/11/usr.sbin/makefs/ffs/ffs_subr.c Wed Apr 25 01:30:29 2018 (r332979) +++ stable/11/usr.sbin/makefs/ffs/ffs_subr.c Wed Apr 25 01:35:06 2018 (r332980) @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include +#include #include #include Modified: stable/11/usr.sbin/makefs/mtree.c ============================================================================== --- stable/11/usr.sbin/makefs/mtree.c Wed Apr 25 01:30:29 2018 (r332979) +++ stable/11/usr.sbin/makefs/mtree.c Wed Apr 25 01:35:06 2018 (r332980) @@ -46,10 +46,15 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include "makefs.h" + +#ifndef ENOATTR +#define ENOATTR ENOMSG +#endif #define IS_DOT(nm) ((nm)[0] == '.' && (nm)[1] == '\0') #define IS_DOTDOT(nm) ((nm)[0] == '.' && (nm)[1] == '.' && (nm)[2] == '\0') Modified: stable/11/usr.sbin/makefs/walk.c ============================================================================== --- stable/11/usr.sbin/makefs/walk.c Wed Apr 25 01:30:29 2018 (r332979) +++ stable/11/usr.sbin/makefs/walk.c Wed Apr 25 01:35:06 2018 (r332980) @@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$"); #include +#include #include #include