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/bfd/freebsd.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/bfd/freebsd.h')
| -rw-r--r-- | gnu/usr.bin/binutils/bfd/freebsd.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/usr.bin/binutils/bfd/freebsd.h b/gnu/usr.bin/binutils/bfd/freebsd.h index c2e3af02cf4..424484f6148 100644 --- a/gnu/usr.bin/binutils/bfd/freebsd.h +++ b/gnu/usr.bin/binutils/bfd/freebsd.h @@ -1,5 +1,5 @@ /* BFD back-end definitions used by all FreeBSD targets. - Copyright 1990, 1991, 1992, 1996, 1997, 2000, 2001 + Copyright 1990, 1991, 1992, 1996, 1997, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -61,7 +61,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define SWAP_MAGIC(ext) bfd_getl32 (ext) #define MY_write_object_contents MY(write_object_contents) -static boolean MY(write_object_contents) PARAMS ((bfd *abfd)); +static bfd_boolean MY(write_object_contents) PARAMS ((bfd *abfd)); #include "aout-target.h" @@ -69,7 +69,7 @@ static boolean MY(write_object_contents) PARAMS ((bfd *abfd)); Section contents have already been written. We write the file header, symbols, and relocation. */ -static boolean +static bfd_boolean MY(write_object_contents) (abfd) bfd *abfd; { @@ -102,5 +102,5 @@ MY(write_object_contents) (abfd) WRITE_HEADERS(abfd, execp); - return true; + return TRUE; } |