Re: more gcc warnings

[Paul Eggert]

Does the following patch fix your problems with Cygwin?  (I haven't
had time to write a changelog entry for it.)  Most likely it won't
work on some older hosts, but we can cross that bridge if we come to
it.


Index: configure.ac
===================================================================
RCS file: /fetish/cu/configure.ac,v
retrieving revision 1.58
diff -p -u -r1.58 configure.ac
--- configure.ac        8 Jul 2005 22:53:50 -0000       1.58
+++ configure.ac        9 Jul 2005 00:09:22 -0000
@@ -50,7 +50,6 @@ AC_CHECK_FUNCS(gethostid,
 
 gl_MACROS
 
-AC_HEADER_TIOCGWINSZ()
 gl_WINSIZE_IN_PTEM
 
 AC_MSG_CHECKING(whether localtime caches TZ)
Index: m4/jm-macros.m4
===================================================================
RCS file: /fetish/cu/m4/jm-macros.m4,v
retrieving revision 1.225
diff -p -u -r1.225 jm-macros.m4
--- m4/jm-macros.m4     8 Jul 2005 22:56:17 -0000       1.225
+++ m4/jm-macros.m4     9 Jul 2005 00:09:22 -0000
@@ -196,7 +196,7 @@ AC_DEFUN([gl_CHECK_ALL_HEADERS],
     stdlib.h \
     stdint.h \
     string.h \
-    stropt.h \
+    stropts.h \
     sys/filsys.h \
     sys/fs/s5param.h \
     sys/fs_types.h \
Index: src/cat.c
===================================================================
RCS file: /fetish/cu/src/cat.c,v
retrieving revision 1.103
diff -p -u -r1.103 cat.c
--- src/cat.c   8 Jul 2005 22:54:15 -0000       1.103
+++ src/cat.c   9 Jul 2005 00:09:23 -0000
@@ -27,12 +27,14 @@
 #include <stdio.h>
 #include <getopt.h>
 #include <sys/types.h>
-#if HAVE_STROPT_H
-# include <stropt.h>
+
+#if HAVE_STROPTS_H
+# include <stropts.h>
 #endif
-#if HAVE_FIONREAD_IN_SYS_IOCTL
+#if HAVE_SYS_IOCTL_H
 # include <sys/ioctl.h>
 #endif
+
 #include "system.h"
 #include "error.h"
 #include "full-write.h"
Index: src/ls.c
===================================================================
RCS file: /fetish/cu/src/ls.c,v
retrieving revision 1.393
diff -p -u -r1.393 ls.c
--- src/ls.c    8 Jul 2005 22:54:40 -0000       1.393
+++ src/ls.c    9 Jul 2005 00:09:23 -0000
@@ -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
Index: src/stty.c
===================================================================
RCS file: /fetish/cu/src/stty.c,v
retrieving revision 1.137
diff -p -u -r1.137 stty.c
--- src/stty.c  8 Jul 2005 22:54:40 -0000       1.137
+++ src/stty.c  9 Jul 2005 00:09:23 -0000
@@ -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"