Module: wine Branch: master Commit: 7d5af6559104169a9fe37e557edd5e1527da62a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d5af6559104169a9fe37e557...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Dec 9 10:55:02 2021 +0100
configure: Assume that termios.h is available on Unix.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
configure | 6 ------ configure.ac | 1 - dlls/ntdll/unix/serial.c | 2 -- include/config.h.in | 3 --- server/serial.c | 4 +--- 5 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/configure b/configure index c2f114b9a0e..d1a52a116f4 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" "termios.h" "ac_cv_header_termios_h" "$ac_includes_default" -if test "x$ac_cv_header_termios_h" = xyes -then : - printf "%s\n" "#define HAVE_TERMIOS_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 diff --git a/configure.ac b/configure.ac index d023f77a275..d032c60e5c3 100644 --- a/configure.ac +++ b/configure.ac @@ -511,7 +511,6 @@ AC_CHECK_HEADERS(\ sys/vnode.h \ sys/wait.h \ syscall.h \ - termios.h \ unistd.h \ utime.h \ valgrind/memcheck.h \ diff --git a/dlls/ntdll/unix/serial.c b/dlls/ntdll/unix/serial.c index 83244d02d41..ff2786ada70 100644 --- a/dlls/ntdll/unix/serial.c +++ b/dlls/ntdll/unix/serial.c @@ -31,9 +31,7 @@ #include <stdlib.h> #include <stdarg.h> #include <stdio.h> -#ifdef HAVE_TERMIOS_H #include <termios.h> -#endif #include <unistd.h> #include <fcntl.h> #include <sys/stat.h> diff --git a/include/config.h.in b/include/config.h.in index 2affc4d6329..9ff8a89f888 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -751,9 +751,6 @@ /* Define to 1 if you have the `tcdrain' function. */ #undef HAVE_TCDRAIN
-/* Define to 1 if you have the <termios.h> header file. */ -#undef HAVE_TERMIOS_H - /* Define to 1 if you have the `thr_kill2' function. */ #undef HAVE_THR_KILL2
diff --git a/server/serial.c b/server/serial.c index e84da228125..905bde4d69a 100644 --- a/server/serial.c +++ b/server/serial.c @@ -31,14 +31,12 @@ #include <sys/time.h> #include <sys/types.h> #include <time.h> +#include <termios.h> #include <unistd.h> #include <poll.h> #ifdef HAVE_UTIME_H #include <utime.h> #endif -#ifdef HAVE_TERMIOS_H -#include <termios.h> -#endif #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif