From: Nick Ing-Simmons <nik@tiuk.ti.com>
Date: Tue, 5 Dec 2000 23:02:39 +0000 (+0000)
Subject: Integrate mainline.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=eadce870788b7d714b94b6f31ade209530f13e95;p=p5sagit%2Fp5-mst-13.2.git

Integrate mainline.

p4raw-id: //depot/perlio@8003
---

eadce870788b7d714b94b6f31ade209530f13e95
diff --cc perl.c
index 1467df1,308d0d3..7064e2b
--- a/perl.c
+++ b/perl.c
@@@ -786,18 -785,12 +785,17 @@@ 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()) {
- 	PerlIO_cleanup();     
-     }
+     if (PerlProc_lasthost())
 -	PerlIO_cleanup();     
++	PerlIO_cleanup();
      PerlMem_free(aTHXx);
      win32_delete_internal_host(host);
 +#else
-     PerlIO_cleanup();     
++    PerlIO_cleanup();
 +    PerlMem_free(aTHXx);
 +#endif
  #  else
      PerlMem_free(aTHXx);
  #  endif