New upstream version 0.7.2

[mirror_zfs-debian.git] / lib / libspl / include / sys / types.h

diff --git a/lib/libspl/include/sys/types.h b/lib/libspl/include/sys/types.h
index 25d56bed5dda493d08b00a28301f9dbecf873634..7fb53730f850f8490d22944de4e1c4c657050d9d 100644 (file)
--- a/lib/libspl/include/sys/types.h
+++ b/lib/libspl/include/sys/types.h
@@ -27,6 +27,12 @@
 #ifndef _LIBSPL_SYS_TYPES_H
 #define        _LIBSPL_SYS_TYPES_H
 
+#if defined(HAVE_MAKEDEV_IN_SYSMACROS)
+#include <sys/sysmacros.h>
+#elif defined(HAVE_MAKEDEV_IN_MKDEV)
+#include <sys/mkdev.h>
+#endif
+
 #include <sys/isa_defs.h>
 #include <sys/feature_tests.h>
 #include_next <sys/types.h>
@@ -55,10 +61,6 @@ typedef longlong_t   diskaddr_t;
 typedef ulong_t                pgcnt_t;        /* number of pages */
 typedef long           spgcnt_t;       /* signed number of pages */
 
-typedef longlong_t     hrtime_t;
-typedef struct timespec        timestruc_t;
-typedef struct timespec timespec_t;
-
 typedef short          pri_t;
 
 typedef int            zoneid_t;
@@ -68,6 +70,7 @@ typedef int           major_t;
 typedef int            minor_t;
 
 typedef ushort_t o_mode_t; /* old file attribute type */
+typedef short          index_t;
 
 /*
  * Definitions remaining from previous partial support for 64-bit file