Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch

2008-12-10 15:51:57 -08:00 · 2008-12-10 15:51:57 -08:00 · 695f8589f4
parent 16bf84ee9b df91e02549
commit 695f8589f4
2 changed files with 1 additions and 2 deletions
--- a/zfs/lib/libspl/include/sys/time.h
+++ b/zfs/lib/libspl/include/sys/time.h
@ -27,6 +27,7 @@
 #ifndef _SOL_SYS_TIME_H
 #define _SOL_SYS_TIME_H

+#include <sys/types.h>
 #include_next <sys/time.h>

 typedef longlong_t	hrtime_t;
--- a/zfs/lib/libspl/include/sys/types.h
+++ b/zfs/lib/libspl/include/sys/types.h
@ -87,6 +87,4 @@ typedef union {
 } lloff_t;
 #endif

-#include <sys/time.h>
-
 #endif