Run Porting/new-perldelta.pl for v5.23.2

[perl5.git] / win32 / perlhost.h

diff --git a/win32/perlhost.h b/win32/perlhost.h
index 265328b..7a0c3b3 100644 (file)
--- a/win32/perlhost.h
+++ b/win32/perlhost.h
@@ -26,9 +26,6 @@
 #endif
 
 START_EXTERN_C
-extern char *  g_win32_get_privlib(const char *pl, STRLEN *const len);
-extern char *  g_win32_get_sitelib(const char *pl, STRLEN *const len);
-extern char *  g_win32_get_vendorlib(const char *pl, STRLEN *const len);
 extern char *  g_getlogin(void);
 END_EXTERN_C
 
@@ -519,20 +516,20 @@ PerlEnvOsId(struct IPerlEnv* piPerl)
 char*
 PerlEnvLibPath(struct IPerlEnv* piPerl, const char *pl, STRLEN *const len)
 {
-    return g_win32_get_privlib(pl, len);
+    return win32_get_privlib(pl, len);
 }
 
 char*
 PerlEnvSiteLibPath(struct IPerlEnv* piPerl, const char *pl, STRLEN *const len)
 {
-    return g_win32_get_sitelib(pl, len);
+    return win32_get_sitelib(pl, len);
 }
 
 char*
 PerlEnvVendorLibPath(struct IPerlEnv* piPerl, const char *pl,
                     STRLEN *const len)
 {
-    return g_win32_get_vendorlib(pl, len);
+    return win32_get_vendorlib(pl, len);
 }
 
 void
@@ -1759,8 +1756,10 @@ restart:
                SvREFCNT_dec(PL_curstash);
                PL_curstash = (HV *)SvREFCNT_inc(PL_defstash);
            }
-           if (PL_endav && !PL_minus_c)
+           if (PL_endav && !PL_minus_c) {
+               PERL_SET_PHASE(PERL_PHASE_END);
                call_list(oldscope, PL_endav);
+           }
            status = STATUS_EXIT;
            break;
        case 3: