diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/regex.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/regex.c b/src/regex.c index 144c984e98c..1af5ab0edca 100644 --- a/src/regex.c +++ b/src/regex.c | |||
| @@ -260,7 +260,8 @@ char *alloca (); | |||
| 260 | 260 | ||
| 261 | /* Define how to allocate the failure stack. */ | 261 | /* Define how to allocate the failure stack. */ |
| 262 | 262 | ||
| 263 | #ifdef REL_ALLOC | 263 | #if defined (REL_ALLOC) && !defined (REGEX_MALLOC) |
| 264 | |||
| 264 | #define REGEX_ALLOCATE_STACK(size) \ | 265 | #define REGEX_ALLOCATE_STACK(size) \ |
| 265 | r_alloc (&failure_stack_ptr, (size)) | 266 | r_alloc (&failure_stack_ptr, (size)) |
| 266 | #define REGEX_REALLOCATE_STACK(source, osize, nsize) \ | 267 | #define REGEX_REALLOCATE_STACK(source, osize, nsize) \ |
| @@ -268,7 +269,7 @@ char *alloca (); | |||
| 268 | #define REGEX_FREE_STACK(ptr) \ | 269 | #define REGEX_FREE_STACK(ptr) \ |
| 269 | r_alloc_free (&failure_stack_ptr) | 270 | r_alloc_free (&failure_stack_ptr) |
| 270 | 271 | ||
| 271 | #else /* not REL_ALLOC */ | 272 | #else /* not using relocating allocator */ |
| 272 | 273 | ||
| 273 | #ifdef REGEX_MALLOC | 274 | #ifdef REGEX_MALLOC |
| 274 | 275 | ||
| @@ -286,7 +287,7 @@ char *alloca (); | |||
| 286 | #define REGEX_FREE_STACK(arg) | 287 | #define REGEX_FREE_STACK(arg) |
| 287 | 288 | ||
| 288 | #endif /* not REGEX_MALLOC */ | 289 | #endif /* not REGEX_MALLOC */ |
| 289 | #endif /* not REL_ALLOC */ | 290 | #endif /* not using relocating allocator */ |
| 290 | 291 | ||
| 291 | 292 | ||
| 292 | /* True if `size1' is non-NULL and PTR is pointing anywhere inside | 293 | /* True if `size1' is non-NULL and PTR is pointing anywhere inside |