aboutsummaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorGravatar Eric Andersen <andersen@codepoet.org>2001-08-10 21:11:56 +0000
committerGravatar Eric Andersen <andersen@codepoet.org>2001-08-10 21:11:56 +0000
commitdd9173c07fd7222bacd132611aa6b4c9d1090215 (patch)
tree91ead6092e36064c25f3a7fdcb2ace228773583f /shell
parent16815d4b45f6678bfed3fd6e75ef1313e7f4817b (diff)
downloadbusybox-dd9173c07fd7222bacd132611aa6b4c9d1090215.tar.gz
busybox-dd9173c07fd7222bacd132611aa6b4c9d1090215.tar.bz2
Fix a merging error
Diffstat (limited to 'shell')
-rw-r--r--shell/ash.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/shell/ash.c b/shell/ash.c
index bbde91cd1..417ef5d13 100644
--- 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)
{