Fix a merging error

diff --git a/ash.c b/ash.c
index bbde91cd12630aba2a62c89588398b4c23cdf758..417ef5d13befebd20f449aafb78553ca8b32cd21 100644 (file)
--- a/ash.c
+++ b/ash.c
@@ -686,7 +686,6 @@ static void out2fmt (const char *, ...)
 static int xwrite (int, const char *, int);
 
 #define outstr(p,file) fputs(p, file)
-static void outstr (const char *p, FILE *file) { fputs(p, file); }
 static void out1str(const char *p) { outstr(p, stdout); }
 static void out2str(const char *p) { outstr(p, stderr); }
 
@@ -12670,7 +12669,7 @@ findvar(struct var **vpp, const char *name)
 /*
  * Copyright (c) 1999 Herbert Xu <herbert@debian.org>
  * This file contains code for the times builtin.
- * $Id: ash.c,v 1.20 2001/08/10 19:36:07 mjn3 Exp $
+ * $Id: ash.c,v 1.21 2001/08/10 21:11:56 andersen Exp $
  */
 static int timescmd (int argc, char **argv)
 {

diff --git a/shell/ash.c b/shell/ash.c
index bbde91cd12630aba2a62c89588398b4c23cdf758..417ef5d13befebd20f449aafb78553ca8b32cd21 100644 (file)
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -686,7 +686,6 @@ static void out2fmt (const char *, ...)
 static int xwrite (int, const char *, int);
 
 #define outstr(p,file) fputs(p, file)
-static void outstr (const char *p, FILE *file) { fputs(p, file); }
 static void out1str(const char *p) { outstr(p, stdout); }
 static void out2str(const char *p) { outstr(p, stderr); }
 
@@ -12670,7 +12669,7 @@ findvar(struct var **vpp, const char *name)
 /*
  * Copyright (c) 1999 Herbert Xu <herbert@debian.org>
  * This file contains code for the times builtin.
- * $Id: ash.c,v 1.20 2001/08/10 19:36:07 mjn3 Exp $
+ * $Id: ash.c,v 1.21 2001/08/10 21:11:56 andersen Exp $
  */
 static int timescmd (int argc, char **argv)
 {