summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/regex.c9
2 files changed, 12 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 600c6016213..78240a7d8ff 100644
--- 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 b3d0658c7dc..9fe099c7125 100644
--- 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. */