From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sun, 21 Feb 2021 18:32:37 +0000 (-0800)
Subject: ascii: Always include <sys/ioctl.h> if we're calling ioctl.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22c639606904655579afbff9dd0f6319becbb6dd;p=pspp

ascii: Always include <sys/ioctl.h> if we're calling ioctl.

This file included sys/ioctl.h if it was necessary to use the TIOCGWINSZ
constant, but in fact it's needed to call ioctl() at all, so this commit
moves the #include so that it's included whenever we use ioctl().

Bug #60069.
Reported by Jeremy Lavergne.
---

diff --git a/src/output/ascii.c b/src/output/ascii.c
index ee87fa22e3..cd5fcec64b 100644
--- a/src/output/ascii.c
+++ b/src/output/ascii.c
@@ -28,11 +28,8 @@
 #include <uniwidth.h>
 
 #ifdef HAVE_TERMIOS_H
-# include <termios.h>
-#endif
-
-#ifdef GWINSZ_IN_SYS_IOCTL
 # include <sys/ioctl.h>
+# include <termios.h>
 #endif
 
 #include "data/file-name.h"