December 2021 - Wine-commits

Ivo Ivanov : winebus.sys: Use 0 for the infinity durations in the UDEV lnxev backend.
by Alexandre Julliard 09 Dec '21

09 Dec '21

Module: wine Branch: master Commit: 1cab62f1a0db009b142d538c1e0ff4a41eb59ecd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cab62f1a0db009b142d538c… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Thu Dec 9 14:44:13 2021 +0100 winebus.sys: Use 0 for the infinity durations in the UDEV lnxev backend. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51922 Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 56260f9ed61..dec8435555c 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1041,7 +1041,7 @@ static NTSTATUS lnxev_device_physical_effect_update(struct unix_device *iface, B if (params->effect_type == PID_USAGE_UNDEFINED) return STATUS_SUCCESS; if ((status = set_effect_type_from_usage(&effect, params->effect_type))) return status; - effect.replay.length = params->duration; + effect.replay.length = (params->duration == 0xffff ? 0 : params->duration); effect.replay.delay = params->start_delay; effect.trigger.button = params->trigger_button; effect.trigger.interval = params->trigger_repeat_interval;

1 0

Rémi Bernon : winebus.sys: Use an unsigned 16bit range for saturation and deadband values.
by Alexandre Julliard 09 Dec '21

09 Dec '21

Module: wine Branch: master Commit: 4b1f9daad5e1f4f8556a0ac55330dcb82cd695d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b1f9daad5e1f4f8556a0ac5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 9 14:44:14 2021 +0100 winebus.sys: Use an unsigned 16bit range for saturation and deadband values. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51922 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/hid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index 8680f8a088c..32628f1f2fd 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -641,7 +641,7 @@ static BOOL hid_descriptor_add_set_condition(struct unix_device *iface) USAGE(1, PID_USAGE_NEGATIVE_SATURATION), USAGE(1, PID_USAGE_DEAD_BAND), LOGICAL_MINIMUM(1, 0), - LOGICAL_MAXIMUM(2, 0x7fff), + LOGICAL_MAXIMUM(4, 0xffff), PHYSICAL_MINIMUM(1, 0), PHYSICAL_MAXIMUM(2, +10000), REPORT_SIZE(1, 16),

1 0

Rémi Bernon : winebus.sys: Revert direction rotation for UDEV lnxev devices.
by Alexandre Julliard 09 Dec '21

09 Dec '21

Module: wine Branch: master Commit: cbd324124ce2a5ddb241f0ff920660aa55b0b5c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbd324124ce2a5ddb241f0ff… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 9 14:44:15 2021 +0100 winebus.sys: Revert direction rotation for UDEV lnxev devices. This partially reverts b431dceeca9aa0d4229c3597b833bcaf04de7110, which followed some misleading SDL comment, as well as the original dinput evdev backend code, and resulted in inverted directions instead. On the Linux drivers side, both in the PID driver or the I-Force driver, the evdev direction is simply rescaled and passed to the device. It is then very likely that we should pass through the PID reports direction. In some other drivers, the sine of the angle is used to modulate the force magnitude, although that doesn't really tell anything about the orientation of the direction itself. The SDL comment is incorrect, and its code isn't actually doing any kind of conversion other than the rescaling. We now do the same here, and end up with identical values being sent to evdev, whether we use it directly or through the SDL library. It's also been confirmed with hidraw PID capable devices, that with this change, the direction values in the hardware PID reports are consistent between the three backends (SDL, evdev, and hidraw). If some devices are expecting inverted directions then it probably is something that will need to be solved on the Linux driver level. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51922 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index dec8435555c..2269f5b904e 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1046,14 +1046,9 @@ static NTSTATUS lnxev_device_physical_effect_update(struct unix_device *iface, B effect.trigger.button = params->trigger_button; effect.trigger.interval = params->trigger_repeat_interval; - /* Linux FF only supports polar direction, and uses an inverted convention compared - * to SDL or dinput (see SDL src/haptic/linux/SDL_syshaptic.c), where the force pulls - * into the specified direction, instead of coming from it. - * - * The first direction we get from PID is in polar coordinate space, so we need to - * add 180° to make it match Linux coordinates. */ - effect.direction = (params->direction[0] + 18000) % 36000; - effect.direction = effect.direction * 0x800 / 1125; + /* Linux FF only supports polar direction, and the first direction we get from PID + * is in polar coordinate space already. */ + effect.direction = params->direction[0] * 0x800 / 1125; switch (params->effect_type) {

1 0

Henri Verbeet : wined3d: Use the access flags used to create the bo for persistent maps in wined3d_bo_gl_map().
by Alexandre Julliard 09 Dec '21

09 Dec '21

Module: wine Branch: master Commit: 194b47b4fd92dda8ebf24e88ca7a14fc926c84ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=194b47b4fd92dda8ebf24e88… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 9 17:45:15 2021 +0100 wined3d: Use the access flags used to create the bo for persistent maps in wined3d_bo_gl_map(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 6391f6788e9..c08e44ce372 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2711,14 +2711,24 @@ map: gl_info = context_gl->gl_info; wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); - if (gl_info->supported[ARB_BUFFER_STORAGE]) - { - if ((map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, - GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT | wined3d_resource_gl_map_flags(bo, flags))))) - { - if (wined3d_map_persistent()) - bo->b.map_ptr = map_ptr; - } + if (gl_info->supported[ARB_BUFFER_STORAGE] && wined3d_map_persistent()) + { + GLbitfield gl_flags; + + /* When mapping the bo persistently, we need to use the access flags + * used to create the bo, instead of the access flags passed to the + * map call. Otherwise, if for example the initial map call that + * caused the bo to be persistently mapped was a read-only map, + * subsequent write access to the bo would be undefined. */ + gl_flags = bo->flags & ~GL_CLIENT_STORAGE_BIT; + gl_flags |= GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT; + if (!(gl_flags & GL_MAP_READ_BIT)) + gl_flags |= GL_MAP_UNSYNCHRONIZED_BIT; + if (gl_flags & GL_MAP_WRITE_BIT) + gl_flags |= GL_MAP_FLUSH_EXPLICIT_BIT; + + if ((map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, gl_flags)))) + bo->b.map_ptr = map_ptr; } else if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) {

1 0

Dmitry Timoshkov : d3d11: Handle D3D11_FEATURE_D3D9_OPTIONS in d3d11_device_CheckFeatureSupport().
by Alexandre Julliard 09 Dec '21

09 Dec '21

Module: wine Branch: master Commit: d8ba4732086c9ecdd975e6bc21cc59909318805c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8ba4732086c9ecdd975e6bc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 9 17:45:16 2021 +0100 d3d11: Handle D3D11_FEATURE_D3D9_OPTIONS in d3d11_device_CheckFeatureSupport(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 417638bf314..546449037ce 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3941,6 +3941,28 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device2 return S_OK; } + case D3D11_FEATURE_D3D9_OPTIONS: + { + D3D11_FEATURE_DATA_D3D9_OPTIONS *options = feature_support_data; + if (feature_support_data_size != sizeof(*options)) + { + WARN("Invalid data size.\n"); + return E_INVALIDARG; + } + + wined3d_mutex_lock(); + hr = wined3d_device_get_device_caps(device->wined3d_device, &wined3d_caps); + wined3d_mutex_unlock(); + if (FAILED(hr)) + { + WARN("Failed to get device caps, hr %#x.\n", hr); + return hr; + } + + options->FullNonPow2TextureSupport = !(wined3d_caps.TextureCaps & WINED3DPTEXTURECAPS_POW2); + return S_OK; + } + case D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS: { D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS *options = feature_support_data;

1 0

Alexandre Julliard : configure: Assume that unistd.h is available on Unix.
by Alexandre Julliard 09 Dec '21

09 Dec '21

Module: wine Branch: master Commit: 13ec7952e09882846e424e1f42a00de79602ad95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13ec7952e09882846e424e1f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 10:58:13 2021 +0100 configure: Assume that unistd.h is available on Unix. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 6 ------ configure.ac | 1 - dlls/nsiproxy.sys/ndis.c | 3 --- dlls/nsiproxy.sys/tcp.c | 5 +---- dlls/ntdll/unix/env.c | 8 ++------ dlls/ntdll/unix/file.c | 4 +--- dlls/qcap/v4l.c | 2 -- dlls/winealsa.drv/midi.c | 4 +--- dlls/wineandroid.drv/window.c | 4 +--- dlls/winebus.sys/bus_udev.c | 4 +--- dlls/winejoystick.drv/joystick_linux.c | 4 +--- dlls/winex11.drv/clipboard.c | 4 +--- dlls/winex11.drv/systray.c | 4 +--- dlls/winex11.drv/window.c | 4 +--- dlls/winex11.drv/x11drv_main.c | 4 +--- dlls/winex11.drv/xdnd.c | 4 +--- tools/tools.h | 3 --- tools/widl/parser.l | 5 ----- tools/wrc/parser.l | 5 ----- tools/wrc/ppl.l | 2 -- 20 files changed, 13 insertions(+), 67 deletions(-) diff --git a/configure b/configure index d1a52a116f4..c1fdaef554a 100755 --- a/configure +++ b/configure @@ -8713,12 +8713,6 @@ if test "x$ac_cv_header_syscall_h" = xyes then : printf "%s\n" "#define HAVE_SYSCALL_H 1" >>confdefs.h -fi -ac_fn_c_check_header_compile "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default" -if test "x$ac_cv_header_unistd_h" = xyes -then : - printf "%s\n" "#define HAVE_UNISTD_H 1" >>confdefs.h - fi ac_fn_c_check_header_compile "$LINENO" "utime.h" "ac_cv_header_utime_h" "$ac_includes_default" if test "x$ac_cv_header_utime_h" = xyes diff --git a/configure.ac b/configure.ac index d032c60e5c3..b8465cc7489 100644 --- a/configure.ac +++ b/configure.ac @@ -511,7 +511,6 @@ AC_CHECK_HEADERS(\ sys/vnode.h \ sys/wait.h \ syscall.h \ - unistd.h \ utime.h \ valgrind/memcheck.h \ valgrind/valgrind.h diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 3e37bcecc78..a7820832d9a 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -25,10 +25,7 @@ #include "config.h" #include <stdarg.h> - -#ifdef HAVE_UNISTD_H #include <unistd.h> -#endif #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index 9a089ba3de2..c9d3d293229 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -27,15 +27,12 @@ #include <stdarg.h> #include <sys/types.h> #include <dirent.h> +#include <unistd.h> #ifdef HAVE_SYS_PARAM_H #include <sys/param.h> #endif -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif - #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 30d8ac1553c..c7e0674e083 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -33,18 +33,14 @@ #include <stdarg.h> #include <sys/types.h> #include <sys/ioctl.h> -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif +#include <sys/stat.h> +#include <unistd.h> #ifdef HAVE_SYS_PRCTL_H # include <sys/prctl.h> #endif #ifdef HAVE_PWD_H # include <pwd.h> #endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif #ifdef __APPLE__ # include <CoreFoundation/CFLocale.h> # include <CoreFoundation/CFString.h> diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 10d8f3de4a3..5c76a57a48b 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -105,9 +105,7 @@ #include <sys/statfs.h> #endif #include <time.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index b8f6254e251..828113afa3c 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -48,9 +48,7 @@ #ifdef HAVE_LINUX_VIDEODEV2_H #include <linux/videodev2.h> #endif -#ifdef HAVE_UNISTD_H #include <unistd.h> -#endif #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index f2fe6307bb2..073c0a6e3f3 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -36,9 +36,7 @@ #include <string.h> #include <stdarg.h> #include <stdio.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #include <fcntl.h> #include <errno.h> diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index c907001c159..fb1b1420227 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -32,9 +32,7 @@ #include <stdarg.h> #include <stdlib.h> #include <stdio.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #define OEMRESOURCE #include "windef.h" diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 540a4da508f..2c23c81b9ef 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -31,9 +31,7 @@ #include <stdint.h> #include <sys/types.h> #include <dirent.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #include <poll.h> #ifdef HAVE_LIBUDEV_H # include <libudev.h> diff --git a/dlls/winejoystick.drv/joystick_linux.c b/dlls/winejoystick.drv/joystick_linux.c index 7fd2c95aff1..0280fa2534c 100644 --- a/dlls/winejoystick.drv/joystick_linux.c +++ b/dlls/winejoystick.drv/joystick_linux.c @@ -39,9 +39,7 @@ #ifdef HAVE_LINUX_22_JOYSTICK_API -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 4e3320f8ed5..a13d0a55b76 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -69,9 +69,7 @@ #include <stdarg.h> #include <stdio.h> #include <stdlib.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #include <fcntl.h> #include <dlfcn.h> #include <limits.h> diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index 5522b229836..c6d12b21c28 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -26,9 +26,7 @@ #include <stdarg.h> #include <stdlib.h> #include <stdio.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #include <X11/Xlib.h> diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index a9fcfb0e295..29473ceba06 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -25,9 +25,7 @@ #include <stdarg.h> #include <stdlib.h> #include <stdio.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #include <X11/Xlib.h> #include <X11/Xresource.h> diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index e5592184337..ab2af7a9e38 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -29,9 +29,7 @@ #ifdef HAVE_SYS_TIME_H # include <sys/time.h> #endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #include <dlfcn.h> #include <X11/cursorfont.h> #include <X11/Xlib.h> diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index b72a168adce..eb685613b7b 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -22,9 +22,7 @@ #include "config.h" #include <string.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif +#include <unistd.h> #include <stdarg.h> #include <stdio.h> diff --git a/tools/tools.h b/tools/tools.h index 751580d68cb..93a7b3c5b09 100644 --- a/tools/tools.h +++ b/tools/tools.h @@ -30,9 +30,6 @@ #include <fcntl.h> #include <time.h> #include <errno.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif #ifdef _WIN32 # include <direct.h> diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 6070d7e7a1f..fb6aa93e390 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -51,12 +51,7 @@ double [0-9]+\.[0-9]+([eE][+-]?[0-9]+)* #include <assert.h> #include <errno.h> #include <limits.h> - -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#else #define YY_NO_UNISTD_H -#endif #include "widl.h" #include "utils.h" diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index c5d9db1488f..3c3cf973da5 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -104,12 +104,7 @@ ws [ \f\t\r] #include <assert.h> #include <errno.h> #include <limits.h> - -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#else #define YY_NO_UNISTD_H -#endif #include "../tools.h" #include "wrc.h" diff --git a/tools/wrc/ppl.l b/tools/wrc/ppl.l index 632bb61a665..f27a2b48476 100644 --- a/tools/wrc/ppl.l +++ b/tools/wrc/ppl.l @@ -168,9 +168,7 @@ ul [uUlL]|[uUlL][lL]|[lL][uU]|[lL][lL][uU]|[uU][lL][lL]|[lL][uU][lL] # define ULLONG_MAX ((__int64)0xffffffff << 32 | 0xffffffff) #endif -#ifndef HAVE_UNISTD_H #define YY_NO_UNISTD_H -#endif #include "../tools.h" #include "utils.h"

1 0

Alexandre Julliard : configure: Assume that sys/mman.h is available on Unix.
by Alexandre Julliard 09 Dec '21

09 Dec '21

Module: wine Branch: master Commit: e3001b6a7c087da5a680b412d82da878e0149e8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3001b6a7c087da5a680b412… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 11:02:24 2021 +0100 configure: Assume that sys/mman.h is available on Unix. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 6 ------ configure.ac | 1 - dlls/ntdll/unix/loader.c | 4 +--- dlls/ntdll/unix/server.c | 4 +--- dlls/ntdll/unix/sync.c | 2 -- dlls/ntdll/unix/thread.c | 2 -- dlls/ntdll/unix/virtual.c | 4 +--- dlls/qcap/v4l.c | 2 -- dlls/win32u/freetype.c | 4 +--- include/config.h.in | 3 --- libs/wine/loader.c | 2 -- libs/wine/mmap.c | 2 -- loader/preloader.c | 4 +--- loader/preloader_mac.c | 4 +--- server/mapping.c | 4 +--- 15 files changed, 7 insertions(+), 41 deletions(-) diff --git a/configure b/configure index c1fdaef554a..7fdc83547f1 100755 --- a/configure +++ b/configure @@ -8539,12 +8539,6 @@ if test "x$ac_cv_header_sys_link_h" = xyes then : printf "%s\n" "#define HAVE_SYS_LINK_H 1" >>confdefs.h -fi -ac_fn_c_check_header_compile "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_mman_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_MMAN_H 1" >>confdefs.h - fi ac_fn_c_check_header_compile "$LINENO" "sys/modem.h" "ac_cv_header_sys_modem_h" "$ac_includes_default" if test "x$ac_cv_header_sys_modem_h" = xyes diff --git a/configure.ac b/configure.ac index b8465cc7489..ef25cfe1d97 100644 --- a/configure.ac +++ b/configure.ac @@ -482,7 +482,6 @@ AC_CHECK_HEADERS(\ sys/ioctl.h \ sys/ipc.h \ sys/link.h \ - sys/mman.h \ sys/modem.h \ sys/mtio.h \ sys/param.h \ diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index ba56b5e20d5..cc365fd37d1 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -34,6 +34,7 @@ #include <stdlib.h> #include <sys/types.h> #include <sys/stat.h> +#include <sys/mman.h> #include <unistd.h> #include <dlfcn.h> #ifdef HAVE_PWD_H @@ -48,9 +49,6 @@ #ifdef HAVE_SYS_AUXV_H # include <sys/auxv.h> #endif -#ifdef HAVE_SYS_MMAN_H -# include <sys/mman.h> -#endif #ifdef HAVE_SYS_RESOURCE_H # include <sys/resource.h> #endif diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 1dcd0792072..caee1f794db 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -43,6 +43,7 @@ #include <stdlib.h> #include <string.h> #include <sys/types.h> +#include <sys/mman.h> #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif @@ -52,9 +53,6 @@ #ifdef HAVE_SYS_UN_H #include <sys/un.h> #endif -#ifdef HAVE_SYS_MMAN_H -#include <sys/mman.h> -#endif #ifdef HAVE_SYS_PRCTL_H # include <sys/prctl.h> #endif diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index d5d92145503..51505082862 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -33,9 +33,7 @@ #include <limits.h> #include <signal.h> #include <sys/types.h> -#ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> -#endif #ifdef HAVE_SYS_SYSCALL_H #include <sys/syscall.h> #endif diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 00fe2b6fa1b..618ebb82bfb 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -35,9 +35,7 @@ #include <signal.h> #include <sys/types.h> #include <unistd.h> -#ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> -#endif #ifdef HAVE_SYS_TIMES_H #include <sys/times.h> #endif diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index dea16623de7..2ed7a74b875 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -37,9 +37,7 @@ # include <sys/socket.h> #endif #include <sys/stat.h> -#ifdef HAVE_SYS_MMAN_H -# include <sys/mman.h> -#endif +#include <sys/mman.h> #ifdef HAVE_SYS_SYSINFO_H # include <sys/sysinfo.h> #endif diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 828113afa3c..9a66a50e31d 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -35,9 +35,7 @@ #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif -#ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> -#endif #include <errno.h> #ifdef HAVE_SYS_TIME_H #include <sys/time.h> diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c index 48fae25a87e..77f4ef8eab3 100644 --- a/dlls/win32u/freetype.c +++ b/dlls/win32u/freetype.c @@ -33,9 +33,7 @@ #include <sys/stat.h> #include <fcntl.h> #include <dlfcn.h> -#ifdef HAVE_SYS_MMAN_H -# include <sys/mman.h> -#endif +#include <sys/mman.h> #include <string.h> #include <dirent.h> #include <stdio.h> diff --git a/include/config.h.in b/include/config.h.in index 9ff8a89f888..8ad37e3d479 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -637,9 +637,6 @@ /* Define to 1 if you have the <sys/link.h> header file. */ #undef HAVE_SYS_LINK_H -/* Define to 1 if you have the <sys/mman.h> header file. */ -#undef HAVE_SYS_MMAN_H - /* Define to 1 if you have the <sys/modem.h> header file. */ #undef HAVE_SYS_MODEM_H diff --git a/libs/wine/loader.c b/libs/wine/loader.c index edb6e37061d..ad72ec50904 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -28,9 +28,7 @@ #include <stdlib.h> #include <string.h> #include <sys/types.h> -#ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> -#endif #ifdef HAVE_SYS_RESOURCE_H # include <sys/resource.h> #endif diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index 86b25b0a7ac..c8d1b59a4db 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -31,9 +31,7 @@ #ifdef HAVE_SYS_WAIT_H #include <sys/wait.h> #endif -#ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> -#endif #include <unistd.h> #ifdef HAVE_STDINT_H # include <stdint.h> diff --git a/loader/preloader.c b/loader/preloader.c index 7bd6afaeb66..585be50624f 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -71,9 +71,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#ifdef HAVE_SYS_MMAN_H -# include <sys/mman.h> -#endif +#include <sys/mman.h> #ifdef HAVE_SYS_SYSCALL_H # include <sys/syscall.h> #endif diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index 23eee44975f..01a41f08d8c 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -33,9 +33,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#ifdef HAVE_SYS_MMAN_H -# include <sys/mman.h> -#endif +#include <sys/mman.h> #ifdef HAVE_SYS_SYSCALL_H # include <sys/syscall.h> #endif diff --git a/server/mapping.c b/server/mapping.c index 93dae94b7c4..bc9ed5bdcb9 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -27,9 +27,7 @@ #include <stdlib.h> #include <sys/types.h> #include <sys/stat.h> -#ifdef HAVE_SYS_MMAN_H -# include <sys/mman.h> -#endif +#include <sys/mman.h> #include <unistd.h> #include "ntstatus.h"

1 0

Alexandre Julliard : configure: Assume that sys/socket.h is available on Unix.
by Alexandre Julliard 09 Dec '21

09 Dec '21

Module: wine Branch: master Commit: a7ac3de3b36e96c556873d1c7dd68f681c48ffbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7ac3de3b36e96c556873d1c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 11:04:40 2021 +0100 configure: Assume that sys/socket.h is available on Unix. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 116 ++++++++++-------------------------------- configure.ac | 35 +++---------- dlls/nsiproxy.sys/icmp_echo.c | 3 -- dlls/nsiproxy.sys/ip.c | 6 --- dlls/nsiproxy.sys/ndis.c | 6 +-- dlls/nsiproxy.sys/tcp.c | 5 +- dlls/nsiproxy.sys/udp.c | 10 +--- dlls/ntdll/unix/file.c | 2 - dlls/ntdll/unix/process.c | 2 - dlls/ntdll/unix/server.c | 4 +- dlls/ntdll/unix/socket.c | 4 +- dlls/ntdll/unix/virtual.c | 4 +- dlls/winex11.drv/opengl.c | 2 - dlls/ws2_32/unixlib.c | 4 +- include/config.h.in | 3 -- server/mailslot.c | 2 - server/process.c | 4 +- server/request.c | 4 +- server/sock.c | 4 +- 19 files changed, 47 insertions(+), 173 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a7ac3de3b36e96c55687…

1 0

Alexandre Julliard : configure: Assume that sys/time.h is available on Unix.
by Alexandre Julliard 09 Dec '21

09 Dec '21

Module: wine Branch: master Commit: b3ca48f39ce822c197193ffc419771f1869f3c83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3ca48f39ce822c197193ffc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 11:07:29 2021 +0100 configure: Assume that sys/time.h is available on Unix. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 10 +--------- configure.ac | 5 +---- dlls/ntdll/unix/file.c | 4 +--- dlls/ntdll/unix/process.c | 4 +--- dlls/ntdll/unix/sync.c | 4 +--- dlls/ntdll/unix/system.c | 4 +--- dlls/qcap/v4l.c | 2 -- dlls/winex11.drv/x11drv_main.c | 4 +--- dlls/ws2_32/unixlib.c | 4 +--- include/config.h.in | 3 --- 10 files changed, 8 insertions(+), 36 deletions(-) diff --git a/configure b/configure index 2584c750317..cc4bf14c3cc 100755 --- a/configure +++ b/configure @@ -8647,12 +8647,6 @@ if test "x$ac_cv_header_sys_sysinfo_h" = xyes then : printf "%s\n" "#define HAVE_SYS_SYSINFO_H 1" >>confdefs.h -fi -ac_fn_c_check_header_compile "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_time_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_TIME_H 1" >>confdefs.h - fi ac_fn_c_check_header_compile "$LINENO" "sys/timeout.h" "ac_cv_header_sys_timeout_h" "$ac_includes_default" if test "x$ac_cv_header_sys_timeout_h" = xyes @@ -9485,9 +9479,7 @@ then : fi -ac_fn_c_check_header_compile "$LINENO" "linux/videodev2.h" "ac_cv_header_linux_videodev2_h" "#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#endif +ac_fn_c_check_header_compile "$LINENO" "linux/videodev2.h" "ac_cv_header_linux_videodev2_h" "#include <sys/time.h> #include <sys/types.h> #ifdef HAVE_ASM_TYPES_H #include <asm/types.h> diff --git a/configure.ac b/configure.ac index e08c9861a2b..f6cf66661d5 100644 --- a/configure.ac +++ b/configure.ac @@ -500,7 +500,6 @@ AC_CHECK_HEADERS(\ sys/strtio.h \ sys/syscall.h \ sys/sysinfo.h \ - sys/time.h \ sys/timeout.h \ sys/times.h \ sys/uio.h \ @@ -643,9 +642,7 @@ AC_CHECK_HEADERS([pthread_np.h],,, #endif]) AC_CHECK_HEADERS([linux/videodev2.h],,, -[#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#endif +[#include <sys/time.h> #include <sys/types.h> #ifdef HAVE_ASM_TYPES_H #include <asm/types.h> diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 3124147c94d..d4271fda2a8 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -49,9 +49,7 @@ # include <sys/syscall.h> #endif #include <sys/socket.h> -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -#endif +#include <sys/time.h> #ifdef HAVE_SYS_ATTR_H #include <sys/attr.h> #endif diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 256f43750db..a07bbf43a6e 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -34,9 +34,7 @@ #include <string.h> #include <time.h> #include <sys/socket.h> -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -#endif +#include <sys/time.h> #ifdef HAVE_SYS_TIMES_H # include <sys/times.h> #endif diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 51505082862..442243d8bcf 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -37,9 +37,7 @@ #ifdef HAVE_SYS_SYSCALL_H #include <sys/syscall.h> #endif -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -#endif +#include <sys/time.h> #include <poll.h> #include <unistd.h> #ifdef HAVE_SCHED_H diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index d1a40e47bbf..c2f1ee11eca 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -33,9 +33,7 @@ #include <sys/types.h> #include <unistd.h> #include <errno.h> -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -#endif +#include <sys/time.h> #include <time.h> #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 9a66a50e31d..aa4d725939a 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -37,9 +37,7 @@ #endif #include <sys/mman.h> #include <errno.h> -#ifdef HAVE_SYS_TIME_H #include <sys/time.h> -#endif #ifdef HAVE_ASM_TYPES_H #include <asm/types.h> #endif diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index ab2af7a9e38..32beb84a009 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -26,9 +26,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -#endif +#include <sys/time.h> #include <unistd.h> #include <dlfcn.h> #include <X11/cursorfont.h> diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index ea16d1844a1..e89ebe35248 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -33,6 +33,7 @@ #include <unistd.h> #include <sys/types.h> #include <sys/socket.h> +#include <sys/time.h> #ifdef HAVE_NETDB_H # include <netdb.h> #endif @@ -62,9 +63,6 @@ # include <ifaddrs.h> #endif #include <poll.h> -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -#endif #ifdef HAVE_NETIPX_IPX_H # include <netipx/ipx.h> diff --git a/include/config.h.in b/include/config.h.in index b36b109287d..768f36143d6 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -712,9 +712,6 @@ /* Define to 1 if you have the <sys/times.h> header file. */ #undef HAVE_SYS_TIMES_H -/* Define to 1 if you have the <sys/time.h> header file. */ -#undef HAVE_SYS_TIME_H - /* Define to 1 if you have the <sys/types.h> header file. */ #undef HAVE_SYS_TYPES_H

1 0

Alexandre Julliard : configure: Assume that sys/ioctl.h is available on Unix.
by Alexandre Julliard 09 Dec '21

09 Dec '21

Module: wine Branch: master Commit: e5d69d9ee6b01e359abe0ea326c5e13bf81e3042 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5d69d9ee6b01e359abe0ea3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 11:09:50 2021 +0100 configure: Assume that sys/ioctl.h is available on Unix. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 6 ------ configure.ac | 1 - dlls/avicap32/v4l.c | 8 ++------ dlls/mountmgr.sys/diskarb.c | 4 +--- dlls/nsiproxy.sys/ndis.c | 5 +---- dlls/ntdll/unix/cdrom.c | 3 --- dlls/ntdll/unix/file.c | 4 +--- dlls/ntdll/unix/serial.c | 4 +--- dlls/ntdll/unix/socket.c | 4 +--- dlls/ntdll/unix/tape.c | 2 -- dlls/qcap/v4l.c | 2 -- dlls/winebus.sys/bus_udev.c | 4 +--- dlls/winejoystick.drv/joystick_linux.c | 2 -- dlls/wineoss.drv/midi.c | 4 +--- dlls/wineoss.drv/mmaux.c | 4 +--- include/config.h.in | 3 --- server/mailslot.c | 2 -- server/serial.c | 4 +--- server/sock.c | 2 -- 19 files changed, 11 insertions(+), 57 deletions(-) diff --git a/configure b/configure index cc4bf14c3cc..00e3e7844a1 100755 --- a/configure +++ b/configure @@ -8521,12 +8521,6 @@ if test "x$ac_cv_header_sys_filio_h" = xyes 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 diff --git a/configure.ac b/configure.ac index f6cf66661d5..760e4f0ed04 100644 --- a/configure.ac +++ b/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 \ diff --git a/dlls/avicap32/v4l.c b/dlls/avicap32/v4l.c index 4b285d94c3c..4f3a162c838 100644 --- a/dlls/avicap32/v4l.c +++ b/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 diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index e034a4c1c5b..50a32bef079 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/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 diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index bb69c852253..86c4248c9ec 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/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 diff --git a/dlls/ntdll/unix/cdrom.c b/dlls/ntdll/unix/cdrom.c index db3b9cd25c2..a9385daf099 100644 --- a/dlls/ntdll/unix/cdrom.c +++ b/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 diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index d4271fda2a8..e459087af76 100644 --- a/dlls/ntdll/unix/file.c +++ b/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 diff --git a/dlls/ntdll/unix/serial.c b/dlls/ntdll/unix/serial.c index ff2786ada70..16c5964b77b 100644 --- a/dlls/ntdll/unix/serial.c +++ b/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 diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index ee27912a3e8..59551aa51e8 100644 --- a/dlls/ntdll/unix/socket.c +++ b/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> diff --git a/dlls/ntdll/unix/tape.c b/dlls/ntdll/unix/tape.c index 741de2f6d95..40ac307a632 100644 --- a/dlls/ntdll/unix/tape.c +++ b/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 diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index aa4d725939a..ae663389d14 100644 --- a/dlls/qcap/v4l.c +++ b/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> diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 2c23c81b9ef..53dca8fce56 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/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 diff --git a/dlls/winejoystick.drv/joystick_linux.c b/dlls/winejoystick.drv/joystick_linux.c index 0280fa2534c..50f06bc7331 100644 --- a/dlls/winejoystick.drv/joystick_linux.c +++ b/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 diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 7128d07ec50..439bc9e442c 100644 --- a/dlls/wineoss.drv/midi.c +++ b/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> diff --git a/dlls/wineoss.drv/mmaux.c b/dlls/wineoss.drv/mmaux.c index 26fea510eae..7d0b8ed53cc 100644 --- a/dlls/wineoss.drv/mmaux.c +++ b/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" diff --git a/include/config.h.in b/include/config.h.in index 768f36143d6..7f57ce10a7d 100644 --- a/include/config.h.in +++ b/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 diff --git a/server/mailslot.c b/server/mailslot.c index 5878ba1408a..2d8697ec9bd 100644 --- a/server/mailslot.c +++ b/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> diff --git a/server/serial.c b/server/serial.c index 905bde4d69a..d665eb7fa35 100644 --- a/server/serial.c +++ b/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 diff --git a/server/sock.c b/server/sock.c index 9a686325b27..8521e34ed7e 100644 --- a/server/sock.c +++ b/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

1 0