merge with 1.9.4b

diff --git a/old/sh-utils/ChangeLog b/old/sh-utils/ChangeLog
index 4af5f2e55f55f81086de86f3d3460df00ff2033b..540e21c191a5b15581d51f5510a6fc173aaf0c16 100644 (file)
--- a/old/sh-utils/ChangeLog
+++ b/old/sh-utils/ChangeLog
@@ -1,3 +1,5 @@
+Tue Mar  8 10:29:13 1994  Jim Meyering  (meyering@comco.com)
+
        * configure.in [INSTALL]: When AC_PROG_INSTALL resorts to setting
        this to `./install.sh', make it `../install.sh' instead since that
        script will be invoked only from subdirectories.

diff --git a/src/test.c b/src/test.c
index 2e2bae34eada1ffd9edc11b7ef725315d89e9017..65de25436ba3972e291f96348810a8ab4d8615e4 100644 (file)
--- a/src/test.c
+++ b/src/test.c
@@ -1105,8 +1105,7 @@ test_command (margc, margv)
      int margc;
      char **margv;
 {
-  auto int value;
-  int expr ();
+  int value;
 
 #if !defined (TEST_STANDALONE)
   int code;