Integrate mainline.
Nick Ing-Simmons [Tue, 5 Dec 2000 23:02:39 +0000 (23:02 +0000)]
p4raw-id: //depot/perlio@8003

1  2 
perl.c
pp_sys.c

diff --cc perl.c
--- 1/perl.c
--- 2/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
diff --cc pp_sys.c
Simple merge