summaryrefslogtreecommitdiff
path: root/win32/win32iop.h
diff options
context:
space:
mode:
authorNick Ing-Simmons <nik@tiuk.ti.com>1997-11-16 23:14:36 +0000
committerNick Ing-Simmons <nik@tiuk.ti.com>1997-11-16 23:14:36 +0000
commitbbc8f9de328519d89fa89d8fca21fe808800d6a2 (patch)
tree72f85dccf0490b17a1a933686d1a827c43fb3739 /win32/win32iop.h
parent0fefa03b970ac01e359bb69c9e4daaddc57f3db9 (diff)
downloadperl-bbc8f9de328519d89fa89d8fca21fe808800d6a2.tar.gz
MYMALLOC for Win32:
1. Initialize malloc_mutex before it is used (all platforms!) 2. Adjust #ifdef muddle to allow MYMALLOC and win32_ to coexist 3. Tweak win32/config*.* to define MYMALLOC 4. Provide sbrk() in terms of VirtualAlloc(). Also fixup -MT (perl95) build to handle Perl_current_thread via call to DLL (as though an extension). p4raw-id: //depot/ansiperl@259
Diffstat (limited to 'win32/win32iop.h')
-rw-r--r--win32/win32iop.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/win32/win32iop.h b/win32/win32iop.h
index a60194d0f0..bd70def18e 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)