Fixup accumulated integrate muddles (perlio == devperl again)

p4raw-id: //depot/perlio@8346

diff --git a/perl.c b/perl.c
index 9f197cb..4911e79 100644 (file)
--- a/perl.c
+++ b/perl.c
@@ -788,12 +788,13 @@ perl_free(pTHXx)
 #  if defined(WIN32)
 #  if defined(PERL_IMPLICIT_SYS)
     void *host = w32_internal_host;
-    if (PerlProc_lasthost())
-       PerlIO_cleanup();
+    if (PerlProc_lasthost()) {
+       PerlIO_cleanup();     
+    }
     PerlMem_free(aTHXx);
     win32_delete_internal_host(host);
 #else
-    PerlIO_cleanup();
+    PerlIO_cleanup();     
     PerlMem_free(aTHXx);
 #endif
 #  else

diff --git a/pp_sys.c b/pp_sys.c
index d21694d..ca4d1bd 100644 (file)
--- a/pp_sys.c
+++ b/pp_sys.c
@@ -3830,9 +3830,6 @@ PP(pp_fork)
     if (childpid < 0)
        RETSETUNDEF;
     if (!childpid) {
-#ifdef SOCKS_64BIT_BUG
-       Perl_do_s64_init_buffer();
-#endif
        /*SUPPRESS 560*/
        if ((tmpgv = gv_fetchpv("$", TRUE, SVt_PV)))
            sv_setiv(GvSV(tmpgv), (IV)PerlProc_getpid());