From 99b13ed3fd4f9304c397ead468f7238bafc7518b Mon Sep 17 00:00:00 2001 From: Jim Wilson Date: Mon, 20 Apr 1998 21:12:00 +0000 Subject: [PATCH] Fix BSD/OS build error reported by Shigeya Suzuk. * frame.c (heapsort): Rename to frame_heapsort. From-SVN: r19351 --- gcc/ChangeLog | 2 ++ gcc/frame.c | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index fa11e459cd0..18b0d2c6e4c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,7 @@ Mon Apr 20 20:44:25 1998 Jim Wilson + * frame.c (heapsort): Rename to frame_heapsort. + * gcc.c (do_spec_1, case '['): Move flag out of loop and initialize it. Mon Apr 20 12:43:09 1998 Doug Evans diff --git a/gcc/frame.c b/gcc/frame.c index 6a81e41c2e2..4bd1fee6648 100644 --- a/gcc/frame.c +++ b/gcc/frame.c @@ -269,9 +269,10 @@ fde_split (fde_vector *linear, fde_vector *erratic) linear->count = j; } -/* This is O(n log(n)). */ +/* This is O(n log(n)). BSD/OS defines heapsort in stdlib.h, so we must + use a name that does not conflict. */ static inline void -heapsort (fde_vector *erratic) +frame_heapsort (fde_vector *erratic) { /* For a description of this algorithm, see: Samuel P. Harbison, Guy L. Steele Jr.: C, a reference manual, 2nd ed., @@ -366,7 +367,7 @@ end_fde_sort (fde_accumulator *accu, size_t count) fde_split (&accu->linear, &accu->erratic); if (accu->linear.count + accu->erratic.count != count) abort (); - heapsort (&accu->erratic); + frame_heapsort (&accu->erratic); fde_merge (&accu->linear, &accu->erratic); free (accu->erratic.array); return accu->linear.array; -- 2.30.2