OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix BSD/OS build error reported by Shigeya Suzuk.

Browse Source 
* frame.c (heapsort): Rename to frame_heapsort.

From-SVN: r19351
This commit is contained in:
Jim Wilson 1998-04-20 21:12:00 +00:00 committed by Jim Wilson
parent bb27e6c9ba
commit 99b13ed3fd
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gcc/ChangeLog
View File

@ -1,5 +1,7 @@
Mon Apr 20 20:44:25 1998 Jim Wilson <wilson@cygnus.com> Mon Apr 20 20:44:25 1998 Jim Wilson <wilson@cygnus.com>
* frame.c (heapsort): Rename to frame_heapsort.
* gcc.c (do_spec_1, case '['): Move flag out of loop and initialize it. * gcc.c (do_spec_1, case '['): Move flag out of loop and initialize it.
Mon Apr 20 12:43:09 1998 Doug Evans <devans@canuck.cygnus.com> Mon Apr 20 12:43:09 1998 Doug Evans <devans@canuck.cygnus.com>

7
gcc/frame.c
View File

@ -269,9 +269,10 @@ fde_split (fde_vector *linear, fde_vector *erratic)
linear->count = j; 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 static inline void
heapsort (fde_vector *erratic) frame_heapsort (fde_vector *erratic)
{ {
/* For a description of this algorithm, see: /* For a description of this algorithm, see:
Samuel P. Harbison, Guy L. Steele Jr.: C, a reference manual, 2nd ed., 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); fde_split (&accu->linear, &accu->erratic);
if (accu->linear.count + accu->erratic.count != count) if (accu->linear.count + accu->erratic.count != count)
abort (); abort ();
heapsort (&accu->erratic); frame_heapsort (&accu->erratic);
fde_merge (&accu->linear, &accu->erratic); fde_merge (&accu->linear, &accu->erratic);
free (accu->erratic.array); free (accu->erratic.array);
return accu->linear.array; return accu->linear.array;