diff options
| author | Mark H Weaver <mhw@netris.org> | 2014-04-25 02:06:01 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2014-04-25 02:06:01 -0400 |
| commit | 475772ea57c97d0fa0f9ed9303db137d9798ddd3 (patch) | |
| tree | 99a9ba2ea0b044552016d41c5c9197bbac66d97f /libguile/gc-malloc.c | |
| parent | 0e92ef40d047696eb3334405b2dd32f51ca55006 (diff) | |
| parent | e0da53b4fe4abee2cdcd97fe46eeefcaab1da631 (diff) | |
| download | guile-475772ea57c97d0fa0f9ed9303db137d9798ddd3.tar.gz | |
Merge branch 'stable-2.0'v2.1.0
Conflicts:
GUILE-VERSION
NEWS
guile-readline/ice-9/readline.scm
libguile/async.c
libguile/backtrace.c
libguile/deprecated.h
libguile/gc-malloc.c
libguile/gdbint.c
libguile/init.c
libguile/ioext.c
libguile/mallocs.c
libguile/print.c
libguile/rw.c
libguile/scmsigs.c
libguile/script.c
libguile/simpos.c
libguile/snarf.h
libguile/strports.c
libguile/threads.c
libguile/vm-i-scheme.c
libguile/vm-i-system.c
module/srfi/srfi-18.scm
test-suite/Makefile.am
test-suite/standalone/test-num2integral.c
Diffstat (limited to 'libguile/gc-malloc.c')
| -rw-r--r-- | libguile/gc-malloc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libguile/gc-malloc.c b/libguile/gc-malloc.c index d229b90d9..894ca0668 100644 --- 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, - * 2004, 2006, 2008, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ -56,9 +57,7 @@ extern unsigned long * __libc_ia64_register_backing_store_base; #include "libguile/debug-malloc.h" #endif -#ifdef HAVE_UNISTD_H #include <unistd.h> -#endif /* INIT_MALLOC_LIMIT is the initial amount of malloc usage which will |