GNU shell utilities

diff --git a/lib/getdate.y b/lib/getdate.y
index df1a08a..1d56904 100644 (file)
--- a/lib/getdate.y
+++ b/lib/getdate.y
@@ -97,7 +97,7 @@ void *alloca ();
 #undef timezone /* needed for sgi */
 #endif
 
-#if defined(HAVE_SYS_TIMEB_H) || (!defined(USG) && defined(HAVE_FTIME))
+#if defined(HAVE_SYS_TIMEB_H)
 #include <sys/timeb.h>
 #else
 /*

diff --git a/lib/putenv.c b/lib/putenv.c
index b9f4912..47f7256 100644 (file)
--- a/lib/putenv.c
+++ b/lib/putenv.c
@@ -106,7 +106,8 @@ putenv (string)
       char **new_environ = (char **) malloc ((size + 2) * sizeof (char *));
       if (new_environ == NULL)
        return -1;
-      (void) bcopy ((char *) environ, (char *) new_environ, size * sizeof (char *));
+      (void) bcopy ((char *) environ, (char *) new_environ,
+                   size * sizeof (char *));
       new_environ[size] = (char *) string;
       new_environ[size + 1] = NULL;
       if (last_environ != NULL)