[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108392: * lisp.h [REL_ALLOC]: Omit duplicate prototypes.

[Paul Eggert]

------------------------------------------------------------
revno: 108392
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2012-05-27 00:51:09 -0700
message:
  * lisp.h [REL_ALLOC]: Omit duplicate prototypes.
  
  Only r_alloc_inhibit_buffer_relocation needed to be added;
  the others were already declared.
modified:
  src/ChangeLog
  src/lisp.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-05-27 07:32:46 +0000
+++ b/src/ChangeLog     2012-05-27 07:51:09 +0000
@@ -1,5 +1,9 @@
 2012-05-27  Paul Eggert  <address@hidden>
 
+       * 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

=== modified file 'src/lisp.h'
--- a/src/lisp.h        2012-05-27 01:06:44 +0000
+++ b/src/lisp.h        2012-05-27 07:51:09 +0000
@@ -2907,6 +2907,7 @@
 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 @@
 /* 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.  */