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/bfd/osf-core.c | |
| parent | 9f1193e30b5f04af9ea81c644eec79b7b535b890 (diff) | |
Help stupid cvs fixing basic conflicts.
Diffstat (limited to 'gnu/usr.bin/binutils/bfd/osf-core.c')
| -rw-r--r-- | gnu/usr.bin/binutils/bfd/osf-core.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gnu/usr.bin/binutils/bfd/osf-core.c b/gnu/usr.bin/binutils/bfd/osf-core.c index 6d1df9b3709..4f4fc12dc72 100644 --- a/gnu/usr.bin/binutils/bfd/osf-core.c +++ b/gnu/usr.bin/binutils/bfd/osf-core.c @@ -1,5 +1,5 @@ /* BFD back-end for OSF/1 core files. - Copyright 1993, 1994 Free Software Foundation, Inc. + Copyright 1993, 94, 95, 97, 1998 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -24,8 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "sysdep.h" #include "libbfd.h" -#include <stdio.h> -#include <string.h> #include <sys/user.h> #include <sys/core.h> @@ -145,7 +143,7 @@ osf_core_core_file_p (abfd) flags = SEC_HAS_CONTENTS; break; default: - (*_bfd_error_handler) ("Unhandled OSF/1 core file section type %d\n", + (*_bfd_error_handler) (_("Unhandled OSF/1 core file section type %d\n"), core_scnhdr.scntype); continue; } @@ -189,7 +187,7 @@ osf_core_core_file_matches_executable_p (core_bfd, exec_bfd) #define osf_core_get_symtab _bfd_nosymbols_get_symtab #define osf_core_print_symbol _bfd_nosymbols_print_symbol #define osf_core_get_symbol_info _bfd_nosymbols_get_symbol_info -#define osf_core_bfd_is_local_label _bfd_nosymbols_bfd_is_local_label +#define osf_core_bfd_is_local_label_name _bfd_nosymbols_bfd_is_local_label_name #define osf_core_get_lineno _bfd_nosymbols_get_lineno #define osf_core_find_nearest_line _bfd_nosymbols_find_nearest_line #define osf_core_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol @@ -252,5 +250,7 @@ const bfd_target osf_core_vec = BFD_JUMP_TABLE_LINK (_bfd_nolink), BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic), + NULL, + (PTR) 0 /* backend_data */ }; |