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

configure

@@ -8522,12 +8522,6 @@ then :
   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
 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
 then :

configure.ac

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

dlls/avicap32/v4l.c

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

dlls/mountmgr.sys/diskarb.c

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

dlls/nsiproxy.sys/ndis.c

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

dlls/ntdll/unix/cdrom.c

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

dlls/ntdll/unix/file.c

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

dlls/ntdll/unix/serial.c

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

dlls/ntdll/unix/socket.c

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

dlls/ntdll/unix/tape.c

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

dlls/qcap/v4l.c

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

dlls/winebus.sys/bus_udev.c

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

dlls/winejoystick.drv/joystick_linux.c

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

dlls/wineoss.drv/midi.c

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

dlls/wineoss.drv/mmaux.c

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

include/config.h.in

@@ -628,9 +628,6 @@
 /* Define to 1 if you have the <sys/inotify.h> header file. */
 #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. */
 #undef HAVE_SYS_IPC_H
 

server/mailslot.c

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

server/serial.c

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

server/sock.c

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