diff options
author | Marc Espie <espie@cvs.openbsd.org> | 2000-09-12 19:13:03 +0000 |
---|---|---|
committer | Marc Espie <espie@cvs.openbsd.org> | 2000-09-12 19:13:03 +0000 |
commit | 1b50fce4c0ed748c156af3ac629e50cb5e4d0ef4 (patch) | |
tree | edee61faabd18b4a5d84e8cdb679d7a8d1fe171f /gnu/usr.bin/binutils/ld/ldmisc.h | |
parent | 9f1193e30b5f04af9ea81c644eec79b7b535b890 (diff) |
Help stupid cvs fixing basic conflicts.
Diffstat (limited to 'gnu/usr.bin/binutils/ld/ldmisc.h')
-rw-r--r-- | gnu/usr.bin/binutils/ld/ldmisc.h | 4 |
1 files changed, 2 insertions, 2 deletions
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)); |