Mercurial > emacs
changeset 69039:f717c65a39d7
* regex.c: Revert 2006-02-19 change.
Redefine malloc -> xmalloc, realloc -> xrealloc as in Emacs case.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Mon, 20 Feb 2006 16:44:09 +0000 |
| parents | b2288bb7d88f |
| children | ba88f6a465c9 |
| files | src/ChangeLog src/regex.c |
| diffstat | 2 files changed, 18 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Feb 20 16:25:21 2006 +0000 +++ b/src/ChangeLog Mon Feb 20 16:44:09 2006 +0000 @@ -1,7 +1,8 @@ 2006-02-20 Chong Yidong <cyd@stupidchicken.com> - * regex.c (xmalloc, xrealloc): Define these when not linked to - Emacs. + * regex.c: Revert 2006-02-19 change. + (xmalloc, xrealloc): Define these when not linked to Emacs. + Redefine malloc -> xmalloc, realloc -> xrealloc as in Emacs case. 2006-02-19 Luc Teirlinck <teirllm@auburn.edu>
--- a/src/regex.c Mon Feb 20 16:25:21 2006 +0000 +++ b/src/regex.c Mon Feb 20 16:44:09 2006 +0000 @@ -217,6 +217,15 @@ return val; } +# ifdef malloc +# undef malloc +# endif +# define malloc xmalloc +# ifdef realloc +# undef realloc +# endif +# define realloc xrealloc + /* When used in Emacs's lib-src, we need to get bzero and bcopy somehow. If nothing else has been done, use the method below. */ # ifdef INHIBIT_STRING_HEADER @@ -2103,10 +2112,10 @@ work_area->allocated += 16 * sizeof (int); if (work_area->table) work_area->table - = (int *) xrealloc (work_area->table, work_area->allocated); + = (int *) realloc (work_area->table, work_area->allocated); else work_area->table - = (int *) xmalloc (work_area->allocated); + = (int *) malloc (work_area->allocated); } #ifdef emacs @@ -3644,11 +3653,11 @@ if (! fail_stack.stack) fail_stack.stack - = (fail_stack_elt_t *) xmalloc (fail_stack.size + = (fail_stack_elt_t *) malloc (fail_stack.size * sizeof (fail_stack_elt_t)); else fail_stack.stack - = (fail_stack_elt_t *) xrealloc (fail_stack.stack, + = (fail_stack_elt_t *) realloc (fail_stack.stack, (fail_stack.size * sizeof (fail_stack_elt_t))); } @@ -6328,14 +6337,14 @@ preg->used = 0; /* Try to allocate space for the fastmap. */ - preg->fastmap = (char *) xmalloc (1 << BYTEWIDTH); + preg->fastmap = (char *) malloc (1 << BYTEWIDTH); if (cflags & REG_ICASE) { unsigned i; preg->translate - = (RE_TRANSLATE_TYPE) xmalloc (CHAR_SET_SIZE + = (RE_TRANSLATE_TYPE) malloc (CHAR_SET_SIZE * sizeof (*(RE_TRANSLATE_TYPE)0)); if (preg->translate == NULL) return (int) REG_ESPACE;