configure: Assume that sys/ioctl.h is available on Unix.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2021-12-09 11:09:50 +01:00
parent b3ca48f39c
commit e5d69d9ee6
19 changed files with 11 additions and 57 deletions

6
configure vendored
View File

@ -8521,12 +8521,6 @@ if test "x$ac_cv_header_sys_filio_h" = xyes
then : then :
printf "%s\n" "#define HAVE_SYS_FILIO_H 1" >>confdefs.h printf "%s\n" "#define HAVE_SYS_FILIO_H 1" >>confdefs.h
fi
ac_fn_c_check_header_compile "$LINENO" "sys/ioctl.h" "ac_cv_header_sys_ioctl_h" "$ac_includes_default"
if test "x$ac_cv_header_sys_ioctl_h" = xyes
then :
printf "%s\n" "#define HAVE_SYS_IOCTL_H 1" >>confdefs.h
fi fi
ac_fn_c_check_header_compile "$LINENO" "sys/ipc.h" "ac_cv_header_sys_ipc_h" "$ac_includes_default" ac_fn_c_check_header_compile "$LINENO" "sys/ipc.h" "ac_cv_header_sys_ipc_h" "$ac_includes_default"
if test "x$ac_cv_header_sys_ipc_h" = xyes if test "x$ac_cv_header_sys_ipc_h" = xyes

View File

@ -479,7 +479,6 @@ AC_CHECK_HEADERS(\
sys/epoll.h \ sys/epoll.h \
sys/event.h \ sys/event.h \
sys/filio.h \ sys/filio.h \
sys/ioctl.h \
sys/ipc.h \ sys/ipc.h \
sys/link.h \ sys/link.h \
sys/modem.h \ sys/modem.h \

View File

@ -28,12 +28,8 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
#ifdef HAVE_SYS_IOCTL_H
# include <sys/ioctl.h>
#endif
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h> #include <sys/stat.h>
#endif #include <sys/ioctl.h>
#ifdef HAVE_LINUX_VIDEODEV2_H #ifdef HAVE_LINUX_VIDEODEV2_H
# include <linux/videodev2.h> # include <linux/videodev2.h>
#endif #endif

View File

@ -30,9 +30,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h> #include <sys/ioctl.h>
#endif
#ifdef HAVE_DISKARBITRATION_DISKARBITRATION_H #ifdef HAVE_DISKARBITRATION_DISKARBITRATION_H
#include <DiskArbitration/DiskArbitration.h> #include <DiskArbitration/DiskArbitration.h>
#endif #endif

View File

@ -27,6 +27,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/ioctl.h>
#include <unistd.h> #include <unistd.h>
#ifdef HAVE_NET_IF_H #ifdef HAVE_NET_IF_H
@ -49,10 +50,6 @@
#include <net/route.h> #include <net/route.h>
#endif #endif
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
#endif
#ifdef HAVE_SYS_SYSCTL_H #ifdef HAVE_SYS_SYSCTL_H
#include <sys/sysctl.h> #include <sys/sysctl.h>
#endif #endif

View File

@ -41,10 +41,7 @@
# include <sys/sysmacros.h> # include <sys/sysmacros.h>
#endif #endif
#include <sys/types.h> #include <sys/types.h>
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h> #include <sys/ioctl.h>
#endif
#ifdef HAVE_SCSI_SG_H #ifdef HAVE_SCSI_SG_H
# include <scsi/sg.h> # include <scsi/sg.h>
#endif #endif

View File

@ -50,6 +50,7 @@
#endif #endif
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/ioctl.h>
#ifdef HAVE_SYS_ATTR_H #ifdef HAVE_SYS_ATTR_H
#include <sys/attr.h> #include <sys/attr.h>
#endif #endif
@ -79,9 +80,6 @@
#undef list_move_tail #undef list_move_tail
#undef list_remove #undef list_remove
#endif #endif
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
#endif
#ifdef HAVE_LINUX_IOCTL_H #ifdef HAVE_LINUX_IOCTL_H
#include <linux/ioctl.h> #include <linux/ioctl.h>
#endif #endif

View File

@ -36,12 +36,10 @@
#include <fcntl.h> #include <fcntl.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/ioctl.h>
#ifdef HAVE_SYS_FILIO_H #ifdef HAVE_SYS_FILIO_H
# include <sys/filio.h> # include <sys/filio.h>
#endif #endif
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
#endif
#ifdef HAVE_SYS_MODEM_H #ifdef HAVE_SYS_MODEM_H
# include <sys/modem.h> # include <sys/modem.h>
#endif #endif

View File

@ -26,6 +26,7 @@
#include <errno.h> #include <errno.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/ioctl.h>
#include <unistd.h> #include <unistd.h>
#ifdef HAVE_IFADDRS_H #ifdef HAVE_IFADDRS_H
# include <ifaddrs.h> # include <ifaddrs.h>
@ -33,9 +34,6 @@
#ifdef HAVE_NET_IF_H #ifdef HAVE_NET_IF_H
# include <net/if.h> # include <net/if.h>
#endif #endif
#ifdef HAVE_SYS_IOCTL_H
# include <sys/ioctl.h>
#endif
#ifdef HAVE_NETINET_IN_H #ifdef HAVE_NETINET_IN_H
# define __APPLE_USE_RFC_3542 # define __APPLE_USE_RFC_3542
# include <netinet/in.h> # include <netinet/in.h>

View File

@ -31,9 +31,7 @@
#include <string.h> #include <string.h>
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h> #include <sys/ioctl.h>
#endif
#ifdef HAVE_SYS_MTIO_H #ifdef HAVE_SYS_MTIO_H
#include <sys/mtio.h> #include <sys/mtio.h>
#endif #endif

View File

@ -32,9 +32,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <fcntl.h> #include <fcntl.h>
#include <dlfcn.h> #include <dlfcn.h>
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h> #include <sys/ioctl.h>
#endif
#include <sys/mman.h> #include <sys/mman.h>
#include <errno.h> #include <errno.h>
#include <sys/time.h> #include <sys/time.h>

View File

@ -33,15 +33,13 @@
#include <dirent.h> #include <dirent.h>
#include <unistd.h> #include <unistd.h>
#include <poll.h> #include <poll.h>
#include <sys/ioctl.h>
#ifdef HAVE_LIBUDEV_H #ifdef HAVE_LIBUDEV_H
# include <libudev.h> # include <libudev.h>
#endif #endif
#ifdef HAVE_LINUX_HIDRAW_H #ifdef HAVE_LINUX_HIDRAW_H
# include <linux/hidraw.h> # include <linux/hidraw.h>
#endif #endif
#ifdef HAVE_SYS_IOCTL_H
# include <sys/ioctl.h>
#endif
#ifdef HAVE_SYS_INOTIFY_H #ifdef HAVE_SYS_INOTIFY_H
# include <sys/inotify.h> # include <sys/inotify.h>
#endif #endif

View File

@ -44,9 +44,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <fcntl.h> #include <fcntl.h>
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h> #include <sys/ioctl.h>
#endif
#ifdef HAVE_LINUX_IOCTL_H #ifdef HAVE_LINUX_IOCTL_H
#include <linux/ioctl.h> #include <linux/ioctl.h>
#endif #endif

View File

@ -49,9 +49,7 @@
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h> #include <sys/ioctl.h>
#endif
#include <poll.h> #include <poll.h>
#include <sys/soundcard.h> #include <sys/soundcard.h>

View File

@ -26,9 +26,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h> #include <sys/ioctl.h>
#endif
#include <sys/soundcard.h> #include <sys/soundcard.h>
#include "windef.h" #include "windef.h"

View File

@ -628,9 +628,6 @@
/* Define to 1 if you have the <sys/inotify.h> header file. */ /* Define to 1 if you have the <sys/inotify.h> header file. */
#undef HAVE_SYS_INOTIFY_H #undef HAVE_SYS_INOTIFY_H
/* Define to 1 if you have the <sys/ioctl.h> header file. */
#undef HAVE_SYS_IOCTL_H
/* Define to 1 if you have the <sys/ipc.h> header file. */ /* Define to 1 if you have the <sys/ipc.h> header file. */
#undef HAVE_SYS_IPC_H #undef HAVE_SYS_IPC_H

View File

@ -31,9 +31,7 @@
#include <sys/time.h> #include <sys/time.h>
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h> #include <sys/ioctl.h>
#endif
#include <sys/socket.h> #include <sys/socket.h>
#ifdef HAVE_SYS_FILIO_H #ifdef HAVE_SYS_FILIO_H
#include <sys/filio.h> #include <sys/filio.h>

View File

@ -30,6 +30,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/ioctl.h>
#include <time.h> #include <time.h>
#include <termios.h> #include <termios.h>
#include <unistd.h> #include <unistd.h>
@ -37,9 +38,6 @@
#ifdef HAVE_UTIME_H #ifdef HAVE_UTIME_H
#include <utime.h> #include <utime.h>
#endif #endif
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
#endif
#include "ntstatus.h" #include "ntstatus.h"
#define WIN32_NO_STATUS #define WIN32_NO_STATUS

View File

@ -43,9 +43,7 @@
#include <sys/time.h> #include <sys/time.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h> #include <sys/ioctl.h>
#endif
#ifdef HAVE_SYS_FILIO_H #ifdef HAVE_SYS_FILIO_H
# include <sys/filio.h> # include <sys/filio.h>
#endif #endif