Mercurial > hg > octave-nkf > gnulib-hg
changeset 7550:0d3d27f21643
Make it possible to rename obstack_free.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Mon, 23 Oct 2006 19:40:24 +0000 |
parents | 9bda6f37e39b |
children | 0efdbb895e51 |
files | ChangeLog lib/obstack.c lib/obstack.h |
diffstat | 3 files changed, 19 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-10-23 Bruno Haible <bruno@clisp.org> + Paul Eggert <eggert@cs.ucla.edu> + + Ability to rename obstack_free. + * lib/obstack.h (__obstack_free): New macro. Declare instead of + obstack_free. + (obstack_free): Invoke the __obstack_free macro. + * lib/obstack.c (obstack_free): Use __obstack_free macro. + 2006-10-23 Bruno Haible <bruno@clisp.org> Paul Eggert <eggert@cs.ucla.edu>
--- a/lib/obstack.c +++ b/lib/obstack.c @@ -342,7 +342,7 @@ # undef obstack_free void -obstack_free (struct obstack *h, void *obj) +__obstack_free (struct obstack *h, void *obj) { register struct _obstack_chunk *lp; /* below addr of any objects in this chunk */ register struct _obstack_chunk *plp; /* point to previous chunk if any */
--- a/lib/obstack.h +++ b/lib/obstack.h @@ -1,5 +1,5 @@ /* obstack.h - object stack macros - Copyright (C) 1988-1994,1996-1999,2003,2004,2005 + Copyright (C) 1988-1994,1996-1999,2003,2004,2005,2006 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -186,7 +186,12 @@ void (*) (void *, void *), void *); extern int _obstack_memory_used (struct obstack *); -void obstack_free (struct obstack *obstack, void *block); +/* The default name of the function for freeing a chunk is 'obstack_free', + but gnulib users can override this by defining '__obstack_free'. */ +#ifndef __obstack_free +# define __obstack_free obstack_free +#endif +extern void __obstack_free (struct obstack *obstack, void *block); /* Error handler called when `obstack_chunk_alloc' failed to allocate @@ -399,7 +404,7 @@ void *__obj = (OBJ); \ if (__obj > (void *)__o->chunk && __obj < (void *)__o->chunk_limit) \ __o->next_free = __o->object_base = (char *)__obj; \ - else (obstack_free) (__o, __obj); }) + else (__obstack_free) (__o, __obj); }) #else /* not __GNUC__ or not __STDC__ */ @@ -497,7 +502,7 @@ && (h)->temp.tempint < (h)->chunk_limit - (char *) (h)->chunk)) \ ? (int) ((h)->next_free = (h)->object_base \ = (h)->temp.tempint + (char *) (h)->chunk) \ - : (((obstack_free) ((h), (h)->temp.tempint + (char *) (h)->chunk), 0), 0))) + : (((__obstack_free) ((h), (h)->temp.tempint + (char *) (h)->chunk), 0), 0))) #endif /* not __GNUC__ or not __STDC__ */