From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 9 Jul 2005 07:38:28 +0000 (+0000)
Subject: Use only HAVE_SYS_IOCTL_H to decide whether to include sys/ioctl.h.
X-Git-Tag: CPPI-1_12~279
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8d51efbab11bef4e26bfd725c0b02c2841dd0c3f;p=platform%2Fupstream%2Fcoreutils.git

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

diff --git a/src/ls.c b/src/ls.c
index 8365e52..8157e7d 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -42,8 +42,10 @@
 #if HAVE_TERMIOS_H
 # include <termios.h>
 #endif
-
-#ifdef GWINSZ_IN_SYS_IOCTL
+#if HAVE_STROPTS_H
+# include <stropts.h>
+#endif
+#if HAVE_SYS_IOCTL_H
 # include <sys/ioctl.h>
 #endif
 
@@ -60,10 +62,6 @@
 #include <getopt.h>
 #include <signal.h>
 
-#if HAVE_STROPT_H
-# include <stropt.h>
-#endif
-
 /* Use SA_NOCLDSTOP as a proxy for whether the sigaction machinery is
    present.  */
 #ifndef SA_NOCLDSTOP