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

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 <behlendorf1@llnl.gov>
Signed-off-by: Turbo Fredriksson <turbo@bayour.com>
Closes #585
This commit is contained in:
Brian Behlendorf 2014-08-27 14:12:18 -07:00
parent dea377c0d9
commit 9ad656b2d0
3 changed files with 0 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
config/user-ioctl.m4
View File

@ -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
])

1
config/user.m4
View File

@ -7,7 +7,6 @@ AC_DEFUN([ZFS_AC_CONFIG_USER], [
ZFS_AC_CONFIG_USER_SYSVINIT ZFS_AC_CONFIG_USER_SYSVINIT
ZFS_AC_CONFIG_USER_DRACUT ZFS_AC_CONFIG_USER_DRACUT
ZFS_AC_CONFIG_USER_ARCH ZFS_AC_CONFIG_USER_ARCH
ZFS_AC_CONFIG_USER_IOCTL
ZFS_AC_CONFIG_USER_ZLIB ZFS_AC_CONFIG_USER_ZLIB
ZFS_AC_CONFIG_USER_LIBUUID ZFS_AC_CONFIG_USER_LIBUUID
ZFS_AC_CONFIG_USER_LIBBLKID ZFS_AC_CONFIG_USER_LIBBLKID

8
lib/libspl/include/unistd.h
View File

@ -29,15 +29,7 @@
#ifndef _LIBSPL_UNISTD_H #ifndef _LIBSPL_UNISTD_H
#define _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> #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) #if !defined(HAVE_ISSETUGID)
#include <sys/types.h> #include <sys/types.h>