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/gprof/hertz.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/usr.bin/binutils/gprof/hertz.c') diff --git a/gnu/usr.bin/binutils/gprof/hertz.c b/gnu/usr.bin/binutils/gprof/hertz.c index 1998d4b7b72..6fa1db49ce2 100644 --- a/gnu/usr.bin/binutils/gprof/hertz.c +++ b/gnu/usr.bin/binutils/gprof/hertz.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1983, 1993, 2001 + * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,6 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ +#include "gprof.h" #include "hertz.h" -- cgit v1.2.3