diff options
| author | Jim Wilson <wilson@cygnus.com> | 1998-04-20 21:12:00 +0000 |
|---|---|---|
| committer | Jim Wilson <wilson@gcc.gnu.org> | 1998-04-20 14:12:00 -0700 |
| commit | 99b13ed3fd4f9304c397ead468f7238bafc7518b (patch) | |
| tree | 60c1aaabfae2b57d3767756c5236321340947b61 /gcc/frame.c | |
| parent | bb27e6c9bae423737f50d3024b7cb49843da4b67 (diff) | |
| download | gcc-99b13ed3fd4f9304c397ead468f7238bafc7518b.zip gcc-99b13ed3fd4f9304c397ead468f7238bafc7518b.tar.gz gcc-99b13ed3fd4f9304c397ead468f7238bafc7518b.tar.bz2 | |
Fix BSD/OS build error reported by Shigeya Suzuk.
* frame.c (heapsort): Rename to frame_heapsort.
From-SVN: r19351
Diffstat (limited to 'gcc/frame.c')
| -rw-r--r-- | gcc/frame.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gcc/frame.c b/gcc/frame.c index 6a81e41c..4bd1fee 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; |