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

This commit is contained in:
Brian Behlendorf 2008-12-10 15:51:58 -08:00
commit 056c622f86
2 changed files with 1 additions and 2 deletions

View File

@ -27,6 +27,7 @@
#ifndef _SOL_SYS_TIME_H #ifndef _SOL_SYS_TIME_H
#define _SOL_SYS_TIME_H #define _SOL_SYS_TIME_H
#include <sys/types.h>
#include_next <sys/time.h> #include_next <sys/time.h>
typedef longlong_t hrtime_t; typedef longlong_t hrtime_t;

View File

@ -87,6 +87,4 @@ typedef union {
} lloff_t; } lloff_t;
#endif #endif
#include <sys/time.h>
#endif #endif