From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 9 Jul 2005 07:39:04 +0000 (+0000)
Subject: Use only HAVE_SYS_IOCTL_H to decide whether to include sys/ioctl.h.
X-Git-Tag: CPPI-1_12~278
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d94b54ec17d1f3bcd80175a4d8cd16a2b8bccdcd;p=thirdparty%2Fcoreutils.git

Use only HAVE_SYS_IOCTL_H to decide whether to include sys/ioctl.h.
stropt.h -> stropts.h
---

diff --git a/src/stty.c b/src/stty.c
index eabda01c46..9e1ba0a7c0 100644
--- a/src/stty.c
+++ b/src/stty.c
@@ -36,28 +36,28 @@
 
 #include <stdio.h>
 #include <sys/types.h>
+
 #if HAVE_TERMIOS_H
 # include <termios.h>
 #endif
-#ifdef GWINSZ_IN_SYS_IOCTL
+#if HAVE_STROPTS_H
+# include <stropts.h>
+#endif
+#ifdef HAVE_SYS_IOCTL_H
 # include <sys/ioctl.h>
 #endif
+
 #ifdef WINSIZE_IN_PTEM
 # include <sys/stream.h>
 # include <sys/ptem.h>
 #endif
 #ifdef GWINSZ_IN_SYS_PTY
-# include <sys/ioctl.h>
 # include <sys/tty.h>
 # include <sys/pty.h>
 #endif
 #include <getopt.h>
 #include <stdarg.h>
 
-#if HAVE_STROPT_H
-# include <stropt.h>
-#endif
-
 #include "system.h"
 #include "error.h"
 #include "fd-reopen.h"