HCoop
/
bpt
/
guile.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
defsubst
[bpt/guile.git]
/
libguile
/
gc-malloc.c
diff --git
a/libguile/gc-malloc.c
b/libguile/gc-malloc.c
index
179558f
..
894ca06
100644
(file)
--- a/
libguile/gc-malloc.c
+++ b/
libguile/gc-malloc.c
@@
-1,5
+1,6
@@
/* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
/* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
- * 2004, 2006, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+ * 2004, 2006, 2008, 2009, 2010, 2011, 2012, 2013,
+ * 2014 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@
-52,15
+53,11
@@
extern unsigned long * __libc_ia64_register_backing_store_base;
#include "libguile/deprecation.h"
#include "libguile/gc.h"
#include "libguile/deprecation.h"
#include "libguile/gc.h"
-#include "libguile/private-gc.h"
-
#ifdef GUILE_DEBUG_MALLOC
#include "libguile/debug-malloc.h"
#endif
#ifdef GUILE_DEBUG_MALLOC
#include "libguile/debug-malloc.h"
#endif
-#ifdef HAVE_UNISTD_H
#include <unistd.h>
#include <unistd.h>
-#endif
/*
INIT_MALLOC_LIMIT is the initial amount of malloc usage which will
/*
INIT_MALLOC_LIMIT is the initial amount of malloc usage which will
@@
-134,17
+131,16
@@
scm_realloc (void *mem, size_t size)
return ptr;
/* Time is hard: trigger a full, ``stop-the-world'' GC, and try again. */
return ptr;
/* Time is hard: trigger a full, ``stop-the-world'' GC, and try again. */
-#ifdef HAVE_GC_GCOLLECT_AND_UNMAP
GC_gcollect_and_unmap ();
GC_gcollect_and_unmap ();
-#else
- GC_gcollect ();
-#endif
ptr = do_realloc (mem, size);
if (ptr)
return ptr;
ptr = do_realloc (mem, size);
if (ptr)
return ptr;
- scm_memory_error ("realloc");
+ scm_report_out_of_memory ();
+
+ /* Not reached. */
+ return NULL;
}
void *
}
void *