(malloc, realloc, free) [emacs]: Undefine before

redefining, to avoid compiler warnings.

diff --git a/src/ChangeLog b/src/ChangeLog
index 600c601621397586c856589d967fbbb697103634..78240a7d8ff665e903825f68c2aabf46b72814b7 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2001-05-12  Eli Zaretskii  <eliz@is.elta.co.il>
 
+       * regex.c (malloc, realloc, free) [emacs]: Undefine before
+       redefining, to avoid compiler warnings.
+
        * w32proc.c: Include syssignal.h, to avoid compiler warnings.
 
        * w32bdf.c (search_file_line, set_bdf_font_info, seek_char)

diff --git a/src/regex.c b/src/regex.c
index b3d0658c7dcd42b000fbd960ad5ef4cfca45550a..9fe099c7125fbfdae837436764d2fdcfaee0f7eb 100644 (file)
--- a/src/regex.c
+++ b/src/regex.c
@@ -124,8 +124,17 @@
 # include "charset.h"
 # include "category.h"
 
+# ifdef malloc
+#  undef malloc
+# endif
 # define malloc xmalloc
+# ifdef realloc
+#  undef realloc
+# endif
 # define realloc xrealloc
+# ifdef free
+#  undef free
+# endif
 # define free xfree
 
 /* Converts the pointer to the char to BEG-based offset from the start.         */