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/hertz.c | |
| 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/hertz.c')
| -rw-r--r-- | gnu/usr.bin/binutils/gprof/hertz.c | 3 |
1 files changed, 2 insertions, 1 deletions
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" |