svn commit: r292757 - head/usr.sbin/fstyp
Allan Jude
allanjude at FreeBSD.org
Sat Dec 26 19:48:37 UTC 2015
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>
More information about the svn-src-all
mailing list