X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fwin32iop.h;h=bd70def18e6187f2d65c8ec8b86f0059928286a6;hb=bbc8f9de328519d89fa89d8fca21fe808800d6a2;hp=a60194d0f0308e628e5b638ecf5a87437482e71c;hpb=0fefa03b970ac01e359bb69c9e4daaddc57f3db9;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/win32/win32iop.h b/win32/win32iop.h
index a60194d..bd70def 100644
--- a/win32/win32iop.h
+++ b/win32/win32iop.h
@@ -219,10 +219,17 @@ END_EXTERN_C
 #define puts			win32_puts
 #define getchar			win32_getchar
 #define putchar			win32_putchar
+
+#if !defined(MYMALLOC) || !defined(PERLDLL)
+#undef malloc
+#undef calloc
+#undef realloc
+#undef free
 #define malloc			win32_malloc
 #define calloc			win32_calloc
 #define realloc			win32_realloc
 #define free			win32_free
+#endif
 
 #define pipe(fd)		win32_pipe((fd), 512, O_BINARY)
 #define pause()			win32_sleep((32767L << 16) + 32767)