From 7689ef0b8aee766803f57ea3869fe62e6075ffe5 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 12 May 2001 10:54:10 +0000 Subject: [PATCH] (malloc, realloc, free) [emacs]: Undefine before redefining, to avoid compiler warnings. --- src/ChangeLog | 3 +++ src/regex.c | 9 +++++++++ 2 files changed, 12 insertions(+) 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 + * 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. */ -- 2.39.2