Skip to content

Commit

Permalink
Retire HAVE_IOCTL_* configure checks
Browse files Browse the repository at this point in the history
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 openzfs#585
  • Loading branch information
behlendorf committed Aug 28, 2014
1 parent dea377c commit 9ad656b
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 44 deletions.
35 changes: 0 additions & 35 deletions config/user-ioctl.m4

This file was deleted.

1 change: 0 additions & 1 deletion config/user.m4
Expand Up @@ -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
Expand Down
8 changes: 0 additions & 8 deletions lib/libspl/include/unistd.h
Expand Up @@ -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>
Expand Down

0 comments on commit 9ad656b

Please sign in to comment.