From: Paul Eggert Date: Sun, 27 May 2012 07:51:09 +0000 (-0700) Subject: * lisp.h [REL_ALLOC]: Omit duplicate prototypes. X-Git-Tag: emacs-24.2.90~471^2~6^2~84 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=57b81a9f519a6538e7caa581a62087bec219abd1;p=emacs.git * lisp.h [REL_ALLOC]: Omit duplicate prototypes. Only r_alloc_inhibit_buffer_relocation needed to be added; the others were already declared. --- diff --git a/src/ChangeLog b/src/ChangeLog index b0b88a86e91..b87398fcbc1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2012-05-27 Paul Eggert + * lisp.h [REL_ALLOC]: Omit duplicate prototypes. + Only r_alloc_inhibit_buffer_relocation needed to be added; + the others were already declared. + * bidi.c (bidi_mirror_char): Don't possibly truncate the integer before checking whether it's out of range. Put the check inside eassert. See diff --git a/src/lisp.h b/src/lisp.h index 522f7cec634..50c21915af1 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -2907,6 +2907,7 @@ extern void *r_alloc (void **, size_t); extern void r_alloc_free (void **); extern void *r_re_alloc (void **, size_t); extern void r_alloc_reset_variable (void **, void **); +extern void r_alloc_inhibit_buffer_relocation (int); #endif /* Defined in chartab.c */ @@ -3633,15 +3634,6 @@ void syms_of_dbusbind (void); /* Defined in msdos.c, w32.c */ extern char *emacs_root_dir (void); #endif /* DOS_NT */ - -#ifdef REL_ALLOC -/* Defined in ralloc.c */ -extern void r_alloc_reset_variable (POINTER_TYPE **, POINTER_TYPE **); -extern POINTER_TYPE *r_alloc (POINTER_TYPE **, size_t); -extern POINTER_TYPE *r_re_alloc (POINTER_TYPE **, size_t); -extern void r_alloc_free (POINTER_TYPE **ptr); -extern void r_alloc_inhibit_buffer_relocation (int); -#endif /* REL_ALLOC */ /* Nonzero means Emacs has already been initialized. Used during startup to detect startup of dumped Emacs. */