# HG changeset patch
# User Jim Meyering <jim@meyering.net>
# Date 752850093 0
# Node ID c7d1f3dfe5941b767242e5e1aeb20d7343b726f8
# Parent  e3b43f32c0989913278b139cf5fadc86835aee41
GNU shell utilities

diff --git a/lib/getdate.y b/lib/getdate.y
--- a/lib/getdate.y
+++ b/lib/getdate.y
@@ -97,7 +97,7 @@
 #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
--- a/lib/putenv.c
+++ b/lib/putenv.c
@@ -106,7 +106,8 @@
       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)