* lisp.h [REL_ALLOC]: Omit duplicate prototypes.
Only r_alloc_inhibit_buffer_relocation needed to be added; the others were already declared.
This commit is contained in:
parent
81899c9138
commit
57b81a9f51
2 changed files with 5 additions and 9 deletions
|
@ -1,5 +1,9 @@
|
|||
2012-05-27 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
* 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
|
||||
|
|
10
src/lisp.h
10
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. */
|
||||
|
|
Loading…
Add table
Reference in a new issue