Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
This commit is contained in:
commit
cae53b7be1
|
@ -29,8 +29,6 @@
|
||||||
#ifndef _LIBSPL_UNISTD_H
|
#ifndef _LIBSPL_UNISTD_H
|
||||||
#define _LIBSPL_UNISTD_H
|
#define _LIBSPL_UNISTD_H
|
||||||
|
|
||||||
#include <zfs_config.h>
|
|
||||||
|
|
||||||
#if !defined(HAVE_IOCTL_IN_UNISTD_H)
|
#if !defined(HAVE_IOCTL_IN_UNISTD_H)
|
||||||
# if defined(HAVE_IOCTL_IN_SYS_IOCTL_H)
|
# if defined(HAVE_IOCTL_IN_SYS_IOCTL_H)
|
||||||
# include <sys/ioctl.h>
|
# include <sys/ioctl.h>
|
||||||
|
|
Loading…
Reference in New Issue