From 631eeff208608ed7b44459bd6c8ae905bcd7e8b6 Mon Sep 17 00:00:00 2001 From: Dale Rahn Date: Mon, 17 May 2004 21:54:57 +0000 Subject: Resolve merge conflicts, adjust method of W^X handing (.sh files) remove testsuites (not useable) remove mmalloc (not part of new binutils). --- gnu/usr.bin/binutils/bfd/freebsd.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/usr.bin/binutils/bfd/freebsd.h') 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; } -- cgit v1.2.3