[Emacs-diffs] Changes to emacs/src/regex.c

[Chong Yidong]

Index: emacs/src/regex.c
diff -u emacs/src/regex.c:1.209 emacs/src/regex.c:1.210
--- emacs/src/regex.c:1.209     Mon Feb 20 16:25:21 2006
+++ emacs/src/regex.c   Mon Feb 20 16:44:09 2006
@@ -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;