diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog index de895eb1dd1b926a0776bf24ec4105c6e0538bd7..f9f4b9e88fa97a760a8ef5e0f018cd66770f1520 100644 --- a/boehm-gc/ChangeLog +++ b/boehm-gc/ChangeLog @@ -1,3 +1,7 @@ +2000-07-24 Alexandre Oliva <aoliva@redhat.com> + + * dyn_load.c (GC_scratch_last_end_ptr): Don't declare a #define. + 2000-06-20 Bryce McKinlay <bryce@albatross.co.nz> Imported version 5.1. diff --git a/boehm-gc/dyn_load.c b/boehm-gc/dyn_load.c index 8d00346c790e7b3d60cbff43f81f8ffdb61700d8..ec909cae3863c3171396de7277acfdac94c32a3f 100644 --- a/boehm-gc/dyn_load.c +++ b/boehm-gc/dyn_load.c @@ -393,7 +393,9 @@ extern void * GC_roots_present(); /* The type is a lie, since the real type doesn't make sense here, */ /* and we only test for NULL. */ +#ifndef GC_scratch_last_end_ptr extern ptr_t GC_scratch_last_end_ptr; /* End of GC_scratch_alloc arena */ +#endif /* We use /proc to track down all parts of the address space that are */ /* mapped by the process, and throw out regions we know we shouldn't */