diff options
| author | Brian Behlendorf <[email protected]> | 2014-08-27 14:12:18 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2014-08-28 07:45:54 -0700 |
| commit | 9ad656b2d025a23ba27a4bc482638e753e62d947 (patch) | |
| tree | 6d1f52d5f1ad26c766b0a7432f08cd156eedeb8e | |
| parent | dea377c0d9d92bd7d10c0e2f006efa11ab28060a (diff) | |
Retire HAVE_IOCTL_* configure checks
The HAVE_IOCTL_* configure checks were originally added for
compatibility with an ancient version of glibc. This support
and additional complexity is no longer needed and is therefore
being removed.
Signed-off-by: Brian Behlendorf <[email protected]>
Signed-off-by: Turbo Fredriksson <[email protected]>
Closes #585
| -rw-r--r-- | config/user-ioctl.m4 | 35 | ||||
| -rw-r--r-- | config/user.m4 | 1 | ||||
| -rw-r--r-- | lib/libspl/include/unistd.h | 8 |
3 files changed, 0 insertions, 44 deletions
diff --git a/config/user-ioctl.m4 b/config/user-ioctl.m4 deleted file mode 100644 index 53fb118fc..000000000 --- a/config/user-ioctl.m4 +++ /dev/null @@ -1,35 +0,0 @@ -dnl # -dnl # Check for ioctl() -dnl # -AC_DEFUN([ZFS_AC_CONFIG_USER_IOCTL], [ - AC_MSG_CHECKING(for ioctl()) - AC_EGREP_HEADER(ioctl, unistd.h, is_unistd=yes, is_unistd=no) - AC_EGREP_HEADER(ioctl, sys/ioctl.h, is_sys_ioctl=yes, is_sys_ioctl=no) - AC_EGREP_HEADER(ioctl, stropts.h, is_stropts=yes, is_stropts=no) - - if test $is_unistd = yes; then - result=unistd.h - AC_DEFINE([HAVE_IOCTL_IN_UNISTD_H], 1, - [Define to 1 if ioctl() defined in <unistd.h>]) - else - - if test $is_sys_ioctl = yes; then - result=sys/ioctl.h - AC_DEFINE([HAVE_IOCTL_IN_SYS_IOCTL_H], 1, - [Define to 1 if ioctl() defined in <sys/ioctl.h>]) - elif test $is_stropts = yes; then - AC_DEFINE([HAVE_IOCTL_IN_STROPTS_H], 1, - result=stropts.h - [Define to 1 if ioctl() defined in <stropts.h>]) - else - result=no - fi - fi - - if test $result = no; then - AC_MSG_RESULT([no]) - AC_MSG_ERROR([*** Cannot locate ioctl() definition]) - else - AC_MSG_RESULT(yes) - fi -]) diff --git a/config/user.m4 b/config/user.m4 index 38024370b..d7ac3f24f 100644 --- a/config/user.m4 +++ b/config/user.m4 @@ -7,7 +7,6 @@ AC_DEFUN([ZFS_AC_CONFIG_USER], [ ZFS_AC_CONFIG_USER_SYSVINIT ZFS_AC_CONFIG_USER_DRACUT ZFS_AC_CONFIG_USER_ARCH - ZFS_AC_CONFIG_USER_IOCTL ZFS_AC_CONFIG_USER_ZLIB ZFS_AC_CONFIG_USER_LIBUUID ZFS_AC_CONFIG_USER_LIBBLKID diff --git a/lib/libspl/include/unistd.h b/lib/libspl/include/unistd.h index 53851f4ab..0246991b4 100644 --- a/lib/libspl/include/unistd.h +++ b/lib/libspl/include/unistd.h @@ -29,15 +29,7 @@ #ifndef _LIBSPL_UNISTD_H #define _LIBSPL_UNISTD_H -#if !defined(HAVE_IOCTL_IN_UNISTD_H) -#if defined(HAVE_IOCTL_IN_SYS_IOCTL_H) #include <sys/ioctl.h> -#elif defined(HAVE_IOCTL_IN_STROPTS_H) -#include <stropts.h> -#else /* HAVE_IOCTL_IN_STROPTS_H */ -#error "System call ioctl() unavailable" -#endif /* HAVE_IOCTL_IN_SYS_IOCTL_H */ -#endif /* !HAVE_IOCTL_IN_UNISTD_H */ #if !defined(HAVE_ISSETUGID) #include <sys/types.h> |