diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-06-02 10:16:09 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-06-02 10:16:09 -0700 |
| commit | 037e65b496485cf3bd570a805bac787abac39cf3 (patch) | |
| tree | 343a49d60bc28ba9871c09442d7971d85a2901d7 /src/lisp.h | |
| parent | b3e945d3a47c5c64d84cb56594ff8c884acb1c37 (diff) | |
| parent | 57f53182c004f51e47818d70968a07579440eaff (diff) | |
| download | emacs-037e65b496485cf3bd570a805bac787abac39cf3.tar.gz | |
Merge: memory_full, gnutls improvements
Diffstat (limited to 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lisp.h b/src/lisp.h index 6e61d0b8bd3..a9e7354f9fc 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -2684,8 +2684,8 @@ extern void allocate_string_data (struct Lisp_String *, EMACS_INT, EMACS_INT); extern void reset_malloc_hooks (void); extern void uninterrupt_malloc (void); extern void malloc_warning (const char *); -extern void memory_full (void) NO_RETURN; -extern void buffer_memory_full (void) NO_RETURN; +extern void memory_full (size_t) NO_RETURN; +extern void buffer_memory_full (EMACS_INT) NO_RETURN; extern int survives_gc_p (Lisp_Object); extern void mark_object (Lisp_Object); #if defined REL_ALLOC && !defined SYSTEM_MALLOC |