From dd9173c07fd7222bacd132611aa6b4c9d1090215 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Fri, 10 Aug 2001 21:11:56 +0000 Subject: [PATCH] Fix a merging error --- ash.c | 3 +-- shell/ash.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ash.c b/ash.c index bbde91cd1..417ef5d13 100644 --- 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 * 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 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 * 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) { -- 2.25.1