* 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 b0b88a8..b87398f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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

diff --git a/src/lisp.h b/src/lisp.h
index 522f7ce..50c2191 100644 (file)
--- 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 */
 \f
 /* Nonzero means Emacs has already been initialized.
    Used during startup to detect startup of dumped Emacs.  */