merge with 1.9.1c

diff --git a/old/sh-utils/ChangeLog b/old/sh-utils/ChangeLog
index 07e26795ba6890488d34f5705228e5dc02f66f9d..0b62a17d3c425b00f8cbade90d753586c9089826 100644 (file)
--- a/old/sh-utils/ChangeLog
+++ b/old/sh-utils/ChangeLog
@@ -1,3 +1,11 @@
+Mon Nov 29 00:28:35 1993  Jim Meyering  (meyering@comco.com)
+
+       * stty.c, configure.in, acconfig.h: Revert change of Nov 26.
+       I am no longer able to reproduce the behavior that prompted
+       that patch -- but I had tested only using an old version of gcc.
+       When building with a more recent version of gcc or with /bin/cc
+       there is no problem.
+
 Sat Nov 27 15:11:21 1993  Jim Meyering  (meyering@comco.com)
 
        * nice.c (main): If an adjustment is specified, but no command is

diff --git a/old/sh-utils/NEWS b/old/sh-utils/NEWS
index 7aa3f47c5f94928899faa18b377e78f1a38ac6ec..f9a42b6891cb1eb6e3bcf3a8292be54525e22732 100644 (file)
--- a/old/sh-utils/NEWS
+++ b/old/sh-utils/NEWS
@@ -1,5 +1,4 @@
 User visible changes in release 1.9.2:
-* stty works on Solaris-2.2
 * who output is better formatted on Solaris and other SysVr4 systems
 * fix a minor problem in formatting the output from `stty -a'
 * yes with arguments outputs newlines again

diff --git a/src/stty.c b/src/stty.c
index 2e9a3f7602cc46b27bb68a0f4efbce82b34ff3f4..b559398e4f63aefc9810fd65bf477ea23360693e 100644 (file)
--- a/src/stty.c
+++ b/src/stty.c
@@ -62,9 +62,6 @@
 
 #if defined(GWINSZ_BROKEN)     /* Such as for SCO UNIX 3.2.2. */
 #undef TIOCGWINSZ
-#ifdef TCGETS                  /* Solaris 2.2 */
-#define TIOCGWINSZ TCGETS
-#endif
 #endif
 
 #ifndef _POSIX_VDISABLE