summaryrefslogtreecommitdiff
path: root/perl.c
diff options
context:
space:
mode:
authorJarkko Hietaniemi <jhi@iki.fi>2000-12-05 22:59:28 +0000
committerJarkko Hietaniemi <jhi@iki.fi>2000-12-05 22:59:28 +0000
commitaecf8a963dc0ba60468bff09784efd1c2ca5518c (patch)
tree924acdf60cfc891cd65677129239a5efac41e459 /perl.c
parentf2b0cce78405182ac37776a9f6651ef31c276b8f (diff)
parentce3e5b80724e7725765c5559e5f4b0058876fc19 (diff)
downloadperl-aecf8a963dc0ba60468bff09784efd1c2ca5518c.tar.gz
Integrate perlio:
[ 8001] Win32 PERL_IMPLICIT_SYS passes all tests with USE_PERLIO - calloc/free suffer from damage on TerminateThread() - use PerlMemShared (as originally planned) now fixed - avoid doing anything important on DLL "detach". [ 8000] Fix gross PerlMemShared issue. p4raw-link: @8001 on //depot/perlio: ce3e5b80724e7725765c5559e5f4b0058876fc19 p4raw-link: @8000 on //depot/perlio: 0a77e2d7f7c1b1af440a8cf545295905853ca727 p4raw-id: //depot/perl@8002
Diffstat (limited to 'perl.c')
-rw-r--r--perl.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/perl.c b/perl.c
index 308d0d31c6..9a577fe4d0 100644
--- a/perl.c
+++ b/perl.c
@@ -785,12 +785,18 @@ perl_free(pTHXx)
#if defined(PERL_OBJECT)
PerlMem_free(this);
#else
-# if defined(PERL_IMPLICIT_SYS) && defined(WIN32)
+# if defined(WIN32)
+# if defined(PERL_IMPLICIT_SYS)
void *host = w32_internal_host;
- if (PerlProc_lasthost())
+ if (PerlProc_lasthost()) {
PerlIO_cleanup();
+ }
PerlMem_free(aTHXx);
win32_delete_internal_host(host);
+#else
+ PerlIO_cleanup();
+ PerlMem_free(aTHXx);
+#endif
# else
PerlMem_free(aTHXx);
# endif