[PATCH 5.7.0] make regcomp reenterable

[p5sagit/p5-mst-13.2.git] / malloc.c

diff --git a/malloc.c b/malloc.c
index eee4da6..42c2d65 100644 (file)
--- a/malloc.c
+++ b/malloc.c
@@ -291,7 +291,7 @@
 #  ifndef warn
 #    define warn(mess, arg) fprintf(stderr, (mess), (arg))
 #  endif 
-#  ifndef warn
+#  ifndef warn2
 #    define warn2(mess, arg1) fprintf(stderr, (mess), (arg1), (arg2))
 #  endif 
 #  ifdef DEBUG_m
@@ -894,9 +894,11 @@ Malloc_t Perl_sbrk (int size);
 #include <unistd.h>
 #endif
 #else
+#ifndef HAS_SBRK_PROTO
 extern Malloc_t sbrk(int);
 #endif
 #endif
+#endif
 
 #ifdef DEBUGGING_MSTATS
 /*