Merge to 5.1.2
This commit is contained in:
Matthew Flatt 2011-07-16 14:18:08 -06:00
parent 9ca07e7d65
commit 3f0914080b
2 changed files with 5 additions and 3 deletions

View File

@ -2108,9 +2108,11 @@ void GC_dump(void)
FPRINTF(STDERR, "End Map\n"); FPRINTF(STDERR, "End Map\n");
} }
intptr_t GC_get_memory_use() long GC_get_memory_use()
{ {
return mem_real_use; /* returns a `long' instead of `intptr_t' for compatibility
with the Boehm GC */
return (long)mem_real_use;
} }
void GC_end_stubborn_change(void *p) void GC_end_stubborn_change(void *p)

View File

@ -34,7 +34,7 @@ SGC_EXTERN void *GC_base(void *);
SGC_EXTERN void GC_dump(void); SGC_EXTERN void GC_dump(void);
SGC_EXTERN intptr_t GC_get_memory_use(); SGC_EXTERN long GC_get_memory_use();
SGC_EXTERN void GC_end_stubborn_change(void *); SGC_EXTERN void GC_end_stubborn_change(void *);