[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107917: Improve ralloc.c interface checking.

[Paul Eggert]

------------------------------------------------------------
revno: 107917
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2012-04-15 18:10:42 -0700
message:
  Improve ralloc.c interface checking.
  
  See http://lists.gnu.org/archive/html/emacs-devel/2011-12/msg00720.html
  * buffer.c (ralloc_reset_variable, r_alloc, r_re_alloc)
  (r_alloc_free) [REL_ALLOC]: Move decls from here ...
  * lisp.h (r_alloc, r_alloc_free, r_re_alloc, r_alloc_reset_variable)
  [REL_ALLOC]: ... to here, to check interface.
  * m/ia64.h (r_alloc, r_alloc_free) [REL_ALLOC && !_MALLOC_INTERNAL]:
  Remove decls.  This fixes an "It stinks!".
modified:
  src/ChangeLog
  src/buffer.c
  src/lisp.h
  src/m/ia64.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-04-16 00:33:25 +0000
+++ b/src/ChangeLog     2012-04-16 01:10:42 +0000
@@ -1,5 +1,14 @@
 2012-04-16  Paul Eggert  <address@hidden>
 
+       Improve ralloc.c interface checking.
+       See http://lists.gnu.org/archive/html/emacs-devel/2011-12/msg00720.html
+       * buffer.c (ralloc_reset_variable, r_alloc, r_re_alloc)
+       (r_alloc_free) [REL_ALLOC]: Move decls from here ...
+       * lisp.h (r_alloc, r_alloc_free, r_re_alloc, r_alloc_reset_variable)
+       [REL_ALLOC]: ... to here, to check interface.
+       * m/ia64.h (r_alloc, r_alloc_free) [REL_ALLOC && !_MALLOC_INTERNAL]:
+       Remove decls.  This fixes an "It stinks!".
+
        * alloc.c (which_symbols): Fix alignment issue / type clash.
 
 2012-04-15  Andreas Schwab  <address@hidden>

=== modified file 'src/buffer.c'
--- a/src/buffer.c      2012-04-09 13:05:48 +0000
+++ b/src/buffer.c      2012-04-16 01:10:42 +0000
@@ -2006,10 +2006,6 @@
   return byte_pos;
 }
 
-#ifdef REL_ALLOC
-extern void r_alloc_reset_variable (POINTER_TYPE *, POINTER_TYPE *);
-#endif /* REL_ALLOC */
-
 DEFUN ("buffer-swap-text", Fbuffer_swap_text, Sbuffer_swap_text,
        1, 1, 0,
        doc: /* Swap the text between current buffer and BUFFER.  */)
@@ -4771,13 +4767,6 @@
                            Buffer-text Allocation
  ***********************************************************************/
 
-#ifdef REL_ALLOC
-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);
-#endif /* REL_ALLOC */
-
-
 /* Allocate NBYTES bytes for buffer B's text buffer.  */
 
 static void

=== modified file 'src/lisp.h'
--- a/src/lisp.h        2012-04-15 16:20:54 +0000
+++ b/src/lisp.h        2012-04-16 01:10:42 +0000
@@ -2832,6 +2832,14 @@
 extern struct buffer * allocate_buffer (void);
 extern int valid_lisp_object_p (Lisp_Object);
 
+#ifdef REL_ALLOC
+/* Defined in ralloc.c */
+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 **);
+#endif
+
 /* Defined in chartab.c */
 EXFUN (Fmake_char_table, 2);
 EXFUN (Fset_char_table_parent, 2);

=== modified file 'src/m/ia64.h'
--- a/src/m/ia64.h      2012-01-19 07:21:25 +0000
+++ b/src/m/ia64.h      2012-04-16 01:10:42 +0000
@@ -30,13 +30,3 @@
 #define EMACS_INT              long
 #define pI                     "l"
 #define EMACS_UINT             unsigned long
-
-#ifdef REL_ALLOC
-#ifndef _MALLOC_INTERNAL
-/* "char *" because ralloc.c defines it that way.  gmalloc.c thinks it
-   is allowed to prototype these as "void *" so we don't prototype in
-   that case.  You're right: it stinks!  */
-extern char *r_alloc (), *r_re_alloc ();
-extern void r_alloc_free ();
-#endif /* not _MALLOC_INTERNAL */
-#endif /* REL_ALLOC */