Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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

This commit is contained in:
Brian Behlendorf 2008-12-10 15:58:54 -08:00
parent 695f8589f4 3074d10601
commit 199e2ebf16
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zfs/lib/libspl/include/sys/time.h
View File

@ -27,11 +27,8 @@
#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>
#include <sys/types.h>
typedef longlong_t hrtime_t;
typedef struct timespec timestruc_t;
#ifndef NANOSEC #ifndef NANOSEC
#define NANOSEC 1000000000 #define NANOSEC 1000000000

3
zfs/lib/libspl/include/sys/types.h
View File

@ -87,4 +87,7 @@ typedef union {
} lloff_t; } lloff_t;
#endif #endif
typedef longlong_t hrtime_t;
typedef struct timespec timestruc_t;
#endif #endif