summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2005-07-09 07:38:28 +0000
committerPaul Eggert <eggert@cs.ucla.edu>2005-07-09 07:38:28 +0000
commit8d51efbab11bef4e26bfd725c0b02c2841dd0c3f (patch)
treed1a168885907b94c3f41db767dcdc7e08a18ccd3
parent8bf75032ee4a518616d0e2af818182450db574c6 (diff)
downloadcoreutils-8d51efbab11bef4e26bfd725c0b02c2841dd0c3f.tar.xz
Use only HAVE_SYS_IOCTL_H to decide whether to include sys/ioctl.h.
stropt.h -> stropts.h
-rw-r--r--src/ls.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/ls.c b/src/ls.c
index 8365e5286..8157e7d9d 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