diff options
| author | Sam Steingold <sds@gnu.org> | 2007-06-20 12:18:47 +0000 |
|---|---|---|
| committer | Sam Steingold <sds@gnu.org> | 2007-06-20 12:18:47 +0000 |
| commit | 3cacba85d91d453b8dccf787bb615db179996c4f (patch) | |
| tree | 25695cc3cb56cd43f9991e6a8c6f67ca2dfd4444 | |
| parent | 794855cae23e94965b648d7ef559296bfa9282f7 (diff) | |
| download | emacs-3cacba85d91d453b8dccf787bb615db179996c4f.tar.gz | |
(__morecore): Fix the declaration to comply with the definition.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/gmalloc.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0990941cdf2..f4dd94e8af0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2007-06-18 Sam Steingold <sds@gnu.org> + + * gmalloc.c (__morecore): Fix the declaration to comply with the + definition. + 2007-06-20 Juanma Barranquero <lekktu@gmail.com> * w32term.c (w32_delete_display): Remove leftover declaration. diff --git a/src/gmalloc.c b/src/gmalloc.c index 50535d4940c..76845828d75 100644 --- a/src/gmalloc.c +++ b/src/gmalloc.c @@ -373,7 +373,7 @@ Fifth Floor, Boston, MA 02110-1301, USA. extern __ptr_t bss_sbrk PP ((ptrdiff_t __size)); extern int bss_sbrk_did_unexec; #endif -__ptr_t (*__morecore) PP ((ptrdiff_t __size)) = __default_morecore; +__ptr_t (*__morecore) PP ((__malloc_ptrdiff_t __size)) = __default_morecore; /* Debugging hook for `malloc'. */ __ptr_t (*__malloc_hook) PP ((__malloc_size_t __size)); |