[vte] all: Include <termios.h> directly



commit bd65f62bb4eb9329b51b4665ab2abefbc4f5ff81
Author: Christian Persch <chpe src gnome org>
Date:   Fri Jun 24 22:11:13 2022 +0200

    all: Include <termios.h> directly
    
    <sys/termios.h> is just a deprecated way to include <termios.h> anyway.
    
    https://gitlab.gnome.org/GNOME/vte/-/issues/2564

 meson.build    | 1 -
 src/dumpkeys.c | 7 +------
 src/mev.c      | 5 -----
 src/pty.cc     | 5 -----
 src/vte.cc     | 5 ++---
 5 files changed, 3 insertions(+), 20 deletions(-)
---
diff --git a/meson.build b/meson.build
index e62e9a26..83901580 100644
--- a/meson.build
+++ b/meson.build
@@ -235,7 +235,6 @@ check_headers = [
   'sys/select.h',
   'sys/stream.h',
   'sys/syslimits.h',
-  'sys/termios.h',
   'sys/types.h',
   'sys/wait.h',
   'termios.h',
diff --git a/src/dumpkeys.c b/src/dumpkeys.c
index 5959a96d..08a72d23 100644
--- a/src/dumpkeys.c
+++ b/src/dumpkeys.c
@@ -22,9 +22,7 @@
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
-#ifdef HAVE_SYS_TERMIOS_H
-#include <sys/termios.h>
-#endif
+#include <termios.h>
 #include <sys/time.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -32,9 +30,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_TERMIOS_H
-#include <termios.h>
-#endif
 #include <unistd.h>
 #include <glib.h>
 
diff --git a/src/mev.c b/src/mev.c
index ad4b94dd..2f81a640 100644
--- a/src/mev.c
+++ b/src/mev.c
@@ -17,17 +17,12 @@
 
 #include <config.h>
 #include <sys/types.h>
-#ifdef HAVE_SYS_TERMIOS_H
-#include <sys/termios.h>
-#endif
 #include <sys/time.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <string.h>
-#ifdef HAVE_TERMIOS_H
 #include <termios.h>
-#endif
 #include <unistd.h>
 #include <glib.h>
 #include "caps.hh"
diff --git a/src/pty.cc b/src/pty.cc
index c2d11817..0a22fffc 100644
--- a/src/pty.cc
+++ b/src/pty.cc
@@ -38,9 +38,6 @@
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
-#ifdef HAVE_SYS_TERMIOS_H
-#include <sys/termios.h>
-#endif
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
@@ -52,9 +49,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_TERMIOS_H
 #include <termios.h>
-#endif
 #include <unistd.h>
 #ifdef HAVE_UTIL_H
 #include <util.h>
diff --git a/src/vte.cc b/src/vte.cc
index 19763615..00cd243b 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -25,9 +25,8 @@
 #include <sys/ioctl.h>
 #include <errno.h>
 #include <fcntl.h>
-#ifdef HAVE_SYS_TERMIOS_H
-#include <sys/termios.h>
-#endif
+#include <termios.h>
+
 #ifdef HAVE_STROPTS_H
 #include <stropts.h>
 #endif


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]