From owner-svn-src-head@freebsd.org  Sat Dec 26 19:48:37 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 74388A532BA;
 Sat, 26 Dec 2015 19:48:37 +0000 (UTC)
 (envelope-from allanjude@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 4440B1892;
 Sat, 26 Dec 2015 19:48:37 +0000 (UTC)
 (envelope-from allanjude@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBQJmaoP045776;
 Sat, 26 Dec 2015 19:48:36 GMT (envelope-from allanjude@FreeBSD.org)
Received: (from allanjude@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBQJmaBN045774;
 Sat, 26 Dec 2015 19:48:36 GMT (envelope-from allanjude@FreeBSD.org)
Message-Id: <201512261948.tBQJmaBN045774@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: allanjude set sender to
 allanjude@FreeBSD.org using -f
From: Allan Jude <allanjude@FreeBSD.org>
Date: Sat, 26 Dec 2015 19:48:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r292757 - head/usr.sbin/fstyp
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Dec 2015 19:48:37 -0000

Author: allanjude
Date: Sat Dec 26 19:48:36 2015
New Revision: 292757
URL: https://svnweb.freebsd.org/changeset/base/292757

Log:
  Fix includes in usr.sbin/fstyp/zfs.c
  
  Approved by:	bapt (mentor)
  MFC after:	1 week
  Sponsored by:	ScaleEngine Inc.
  Differential Revision:	https://reviews.freebsd.org/D4710

Modified:
  head/usr.sbin/fstyp/Makefile
  head/usr.sbin/fstyp/zfs.c

Modified: head/usr.sbin/fstyp/Makefile
==============================================================================
--- head/usr.sbin/fstyp/Makefile	Sat Dec 26 19:14:24 2015	(r292756)
+++ head/usr.sbin/fstyp/Makefile	Sat Dec 26 19:48:36 2015	(r292757)
@@ -19,6 +19,8 @@ WARNS?=	2
 SUBDIR+=	tests
 .endif
 
+CFLAGS+=-I${.CURDIR}/../../sys
+
 .if ${MK_ZFS} != "no"
 IGNORE_PRAGMA=  YES
 
@@ -34,8 +36,6 @@ CFLAGS+= -I${.CURDIR}/../../sys/cddl/con
 CFLAGS+= -I${.CURDIR}/../../cddl/contrib/opensolaris/head
 .endif
 
-CFLAGS+=-I${.CURDIR}/../../sys
-
 LIBADD=	geom md
 
 .if ${MK_ZFS} != "no"

Modified: head/usr.sbin/fstyp/zfs.c
==============================================================================
--- head/usr.sbin/fstyp/zfs.c	Sat Dec 26 19:14:24 2015	(r292756)
+++ head/usr.sbin/fstyp/zfs.c	Sat Dec 26 19:48:36 2015	(r292757)
@@ -29,6 +29,9 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
+#include <cddl/compat/opensolaris/sys/types.h>
+#include <sys/time.h>
+#include <cddl/compat/opensolaris/sys/time.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>