diff options
author | Dale Rahn <drahn@cvs.openbsd.org> | 2004-05-17 21:54:57 +0000 |
---|---|---|
committer | Dale Rahn <drahn@cvs.openbsd.org> | 2004-05-17 21:54:57 +0000 |
commit | 631eeff208608ed7b44459bd6c8ae905bcd7e8b6 (patch) | |
tree | 7be124105a0929655708fbbc134f9c2e3189c3f3 /gnu/usr.bin/binutils/gprof/sym_ids.h | |
parent | a7c8e0ae4a4b349099d02bc9d56bcf1979c0f0c3 (diff) |
Resolve merge conflicts, adjust method of W^X handing (.sh files)
remove testsuites (not useable) remove mmalloc (not part of new binutils).
Diffstat (limited to 'gnu/usr.bin/binutils/gprof/sym_ids.h')
-rw-r--r-- | gnu/usr.bin/binutils/gprof/sym_ids.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gnu/usr.bin/binutils/gprof/sym_ids.h b/gnu/usr.bin/binutils/gprof/sym_ids.h index 4cef81d09c6..634ac969de9 100644 --- a/gnu/usr.bin/binutils/gprof/sym_ids.h +++ b/gnu/usr.bin/binutils/gprof/sym_ids.h @@ -1,6 +1,6 @@ /* sym_ids.h - Copyright 2000, 2001 Free Software Foundation, Inc. + Copyright 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of GNU Binutils. @@ -21,8 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef sym_ids_h #define sym_ids_h -#include "symtab.h" - typedef enum { INCL_GRAPH = 0, EXCL_GRAPH, @@ -37,8 +35,8 @@ Table_Id; extern Sym_Table syms[NUM_TABLES]; -extern void sym_id_add PARAMS ((const char *, Table_Id)); -extern void sym_id_parse PARAMS ((void)); -extern bool sym_id_arc_is_present PARAMS ((Sym_Table *, Sym *, Sym *)); +extern void sym_id_add PARAMS ((const char *, Table_Id)); +extern void sym_id_parse PARAMS ((void)); +extern bfd_boolean sym_id_arc_is_present PARAMS ((Sym_Table *, Sym *, Sym *)); #endif /* sym_ids_h */ |