From 1b50fce4c0ed748c156af3ac629e50cb5e4d0ef4 Mon Sep 17 00:00:00 2001 From: Marc Espie Date: Tue, 12 Sep 2000 19:13:03 +0000 Subject: Help stupid cvs fixing basic conflicts. --- gnu/usr.bin/binutils/ld/ldmisc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/usr.bin/binutils/ld/ldmisc.h') diff --git a/gnu/usr.bin/binutils/ld/ldmisc.h b/gnu/usr.bin/binutils/ld/ldmisc.h index f0073a7d7e3..f5b3b4f35af 100644 --- a/gnu/usr.bin/binutils/ld/ldmisc.h +++ b/gnu/usr.bin/binutils/ld/ldmisc.h @@ -24,7 +24,7 @@ extern void einfo PARAMS ((const char *, ...)); extern void minfo PARAMS ((const char *, ...)); extern void info_msg PARAMS ((const char *, ...)); -extern void finfo PARAMS ((FILE *, const char *, ...)); +extern void lfinfo PARAMS ((FILE *, const char *, ...)); #else /* VARARGS*/ extern void einfo (); @@ -33,7 +33,7 @@ extern void minfo (); /* VARARGS*/ extern void info_msg (); /*VARARGS*/ -extern void finfo (); +extern void lfinfo (); #endif extern void info_assert PARAMS ((const char *, unsigned int)); -- cgit v1.2.3