From: Collin Funk <collin.funk1@gmail.com>
Date: Sat, 17 Aug 2024 04:19:46 +0000 (-0700)
Subject: pty: Define 'struct winsize' on all platforms.
X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=5b26891027adad4100b3781f586631ac5ad8e4be;p=gnulib.git

pty: Define 'struct winsize' on all platforms.

* modules/pty (Depends-on): Add termios.
* lib/pty.in.h: Make comments more accurate.
(struct winsize): Remove forward declaration.
---

diff --git a/ChangeLog b/ChangeLog
index ee8851fea5..2f61940815 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2024-08-16  Collin Funk  <collin.funk1@gmail.com>
+
+	pty: Define 'struct winsize' on all platforms.
+	* modules/pty (Depends-on): Add termios.
+	* lib/pty.in.h: Make comments more accurate.
+	(struct winsize): Remove forward declaration.
+
 2024-08-16  Bruno Haible  <bruno@clisp.org>
 
 	gitsub.sh: For a submodule, merge from the right remote branch.
diff --git a/lib/pty.in.h b/lib/pty.in.h
index 37470cb63d..9f597b2252 100644
--- a/lib/pty.in.h
+++ b/lib/pty.in.h
@@ -44,16 +44,14 @@
 # include <libutil.h>
 #endif
 
-/* Get 'struct termios' and 'struct winsize'.  */
+/* Get 'struct termios', if available, and 'struct winsize'.  */
 #include <termios.h>
 #if defined _AIX
 # include <sys/ioctl.h>
 #endif
-/* Mingw lacks 'struct termios' and 'struct winsize', but a forward
-   declaration of an opaque type is sufficient to allow compilation of
-   a stub openpty().  */
+/* Mingw lacks 'struct termios', but a forward declaration of an opaque type is
+   sufficient to allow compilation of a stub openpty().  */
 struct termios;
-struct winsize;
 
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
 
diff --git a/modules/pty b/modules/pty
index 8f3da034fc..7a1a2e3894 100644
--- a/modules/pty
+++ b/modules/pty
@@ -10,6 +10,7 @@ gen-header
 include_next
 snippet/c++defs
 snippet/warn-on-use
+termios
 
 configure.ac:
 gl_PTY_H