Mercurial > hg > xemacs-beta
diff src/gmalloc.c @ 771:943eaba38521
[xemacs-hg @ 2002-03-13 08:51:24 by ben]
The big ben-mule-21-5 check-in!
Various files were added and deleted. See CHANGES-ben-mule.
There are still some test suite failures. No crashes, though.
Many of the failures have to do with problems in the test suite itself
rather than in the actual code. I'll be addressing these in the next
day or so -- none of the test suite failures are at all critical.
Meanwhile I'll be trying to address the biggest issues -- i.e. build
or run failures, which will almost certainly happen on various platforms.
All comments should be sent to ben@xemacs.org -- use a Cc: if necessary
when sending to mailing lists. There will be pre- and post- tags,
something like
pre-ben-mule-21-5-merge-in, and
post-ben-mule-21-5-merge-in.
| author | ben |
|---|---|
| date | Wed, 13 Mar 2002 08:54:06 +0000 |
| parents | b39c14581166 |
| children | e22b0213b713 |
line wrap: on
line diff
--- a/src/gmalloc.c Fri Mar 08 13:33:14 2002 +0000 +++ b/src/gmalloc.c Wed Mar 13 08:54:06 2002 +0000 @@ -4,6 +4,9 @@ /* Get the configuration files if we're being compiled for Emacs. */ #ifdef emacs # include <config.h> +# include "lisp.h" + +# include "sysdep.h" # include "getpagesize.h" # ifndef HAVE_CONFIG_H # define HAVE_CONFIG_H @@ -273,6 +276,10 @@ /* Pick up the current statistics. */ extern struct mstats mstats __P ((void)); +#ifdef __cplusplus +} +#endif + /* Call WARNFUN with a warning message when memory usage is high. */ extern void memory_warnings __P ((__ptr_t __start, void (*__warnfun) __P ((const char *)))); @@ -291,10 +298,6 @@ extern __ptr_t r_re_alloc __P ((__ptr_t *__handleptr, size_t __size)); #endif /* 0 */ -#ifdef __cplusplus -} -#endif - #endif /* malloc.h */ /* Allocate memory on a page boundary. Copyright (C) 1991, 1992, 1993, 1994 Free Software Foundation, Inc.