diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2005-09-30 22:38:16 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2005-09-30 22:38:16 +0000 |
| commit | fa8459a34e076cacde3b7c259af9b5dd84b60802 (patch) | |
| tree | b3d68a9fe6cdfe631bcecb42b30b087aa566e942 /src/emacs.c | |
| parent | b17f937955a92bd8416821ec847d859bc9c3de85 (diff) | |
| download | emacs-fa8459a34e076cacde3b7c259af9b5dd84b60802.tar.gz | |
* image.c (slurp_file, xbm_read_bitmap_data): Cast to the correct
type.
* xterm.c (handle_one_xevent, handle_one_xevent): Likewise.
* unexelf.c (fatal): Fix prototype.
* term.c (fatal): Implement using varargs.
* regex.c (re_char): Move typedef ...
* regex.h (re_char): ... here.
(re_iswctype, re_wctype, re_set_whitespace_regexp): New
prototypes.
* emacs.c (malloc_set_state): Fix return type.
(endif): Fix type.
* lisp.h (fatal): Add argument types.
* dispextern.h (fatal): Delete prototype.
* systime.h: (make_time): Prototype moved from ...
* editfns.c (make_time): ... here.
* editfns.c: Move systime.h include after lisp.h.
* dired.c:
* xsmfns.c:
* process.c: Likewise.
* alloc.c (old_malloc_hook, old_realloc_hook, old_realloc_hook):
Add parameter types.
(__malloc_hook, __realloc_hook, __free_hook): Fix prototypes.
(emacs_blocked_free): Change definition to match __free_hook.
(emacs_blocked_malloc): Change definition to match __malloc_hook.
(emacs_blocked_realloc): Change definition to match
__realloc_hook.
Diffstat (limited to 'src/emacs.c')
| -rw-r--r-- | src/emacs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/emacs.c b/src/emacs.c index bcba251f8c7..80281d4f26b 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -148,7 +148,7 @@ void *malloc_state_ptr; /* From glibc, a routine that returns a copy of the malloc internal state. */ extern void *malloc_get_state (); /* From glibc, a routine that overwrites the malloc internal state. */ -extern void malloc_set_state (); +extern int malloc_set_state (); /* Non-zero if the MALLOC_CHECK_ enviroment variable was set while dumping. Used to work around a bug in glibc's malloc. */ int malloc_using_checking; @@ -1001,7 +1001,7 @@ main (argc, argv && !getrlimit (RLIMIT_STACK, &rlim)) { long newlim; - extern int re_max_failures; + extern size_t re_max_failures; /* Approximate the amount regex.c needs per unit of re_max_failures. */ int ratio = 20 * sizeof (char *); /* Then add 33% to cover the size of the smaller stacks that regex.c |