diff options
| author | Eli Zaretskii | 2001-05-12 10:54:10 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2001-05-12 10:54:10 +0000 |
| commit | 7689ef0b8aee766803f57ea3869fe62e6075ffe5 (patch) | |
| tree | ee325932e0f816be5a4d1cf5f39e2ab068e72441 /src | |
| parent | e7c15bba659f0cad28b72114b1c77225fff36b25 (diff) | |
| download | emacs-7689ef0b8aee766803f57ea3869fe62e6075ffe5.tar.gz emacs-7689ef0b8aee766803f57ea3869fe62e6075ffe5.zip | |
(malloc, realloc, free) [emacs]: Undefine before
redefining, to avoid compiler warnings.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/regex.c | 9 |
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 @@ | |||
| 1 | 2001-05-12 Eli Zaretskii <eliz@is.elta.co.il> | 1 | 2001-05-12 Eli Zaretskii <eliz@is.elta.co.il> |
| 2 | 2 | ||
| 3 | * regex.c (malloc, realloc, free) [emacs]: Undefine before | ||
| 4 | redefining, to avoid compiler warnings. | ||
| 5 | |||
| 3 | * w32proc.c: Include syssignal.h, to avoid compiler warnings. | 6 | * w32proc.c: Include syssignal.h, to avoid compiler warnings. |
| 4 | 7 | ||
| 5 | * w32bdf.c (search_file_line, set_bdf_font_info, seek_char) | 8 | * 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 @@ | |||
| 124 | # include "charset.h" | 124 | # include "charset.h" |
| 125 | # include "category.h" | 125 | # include "category.h" |
| 126 | 126 | ||
| 127 | # ifdef malloc | ||
| 128 | # undef malloc | ||
| 129 | # endif | ||
| 127 | # define malloc xmalloc | 130 | # define malloc xmalloc |
| 131 | # ifdef realloc | ||
| 132 | # undef realloc | ||
| 133 | # endif | ||
| 128 | # define realloc xrealloc | 134 | # define realloc xrealloc |
| 135 | # ifdef free | ||
| 136 | # undef free | ||
| 137 | # endif | ||
| 129 | # define free xfree | 138 | # define free xfree |
| 130 | 139 | ||
| 131 | /* Converts the pointer to the char to BEG-based offset from the start. */ | 140 | /* Converts the pointer to the char to BEG-based offset from the start. */ |