From 242bd272d90e3db273117961eb0699de91f42249 Mon Sep 17 00:00:00 2001
From: mckusick <mckusick@FreeBSD.org>
Date: Mon, 24 Jan 2011 06:17:05 +0000
Subject: The dump, fsck_ffs, fsdb, fsirand, newfs, makefs, and quot utilities
 include sys/time.h instead of time.h. This include is incorrect as per the
 manpages for the APIs and the POSIX definitions. This commit replaces
 sys/time.h where necessary with time.h.

The commit also includes some minor style(9) header fixup in newfs.

This commit is part of a larger effort by Garrett Cooper started in
//depot/user/gcooper/posix-conformance-work/ -- to make FreeBSD more
POSIX compliant.

Submitted by:  Garrett Cooper   yanegomi at gmail dot com
---
 sbin/newfs/mkfs.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'sbin/newfs')

diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c
index 96fa9eb..f98a51a 100644
--- a/sbin/newfs/mkfs.c
+++ b/sbin/newfs/mkfs.c
@@ -44,6 +44,14 @@ static char sccsid[] = "@(#)mkfs.c	8.11 (Berkeley) 5/3/95";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <sys/param.h>
+#include <sys/disklabel.h>
+#include <sys/file.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <sys/resource.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
 #include <err.h>
 #include <grp.h>
 #include <limits.h>
@@ -52,20 +60,11 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <stdint.h>
 #include <stdio.h>
+#include <time.h>
 #include <unistd.h>
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/resource.h>
-#include <sys/stat.h>
 #include <ufs/ufs/dinode.h>
 #include <ufs/ufs/dir.h>
 #include <ufs/ffs/fs.h>
-#include <sys/disklabel.h>
-#include <sys/file.h>
-#include <sys/mman.h>
-#include <sys/ioctl.h>
 #include "newfs.h"
 
 /*
-- 
cgit v1.1