Hand merge of non slab allocator stuff

p4raw-id: //depot/perlio@14267

diff --git a/op.c b/op.c
index 57e7784..1ce71a5 100644 (file)
--- a/op.c
+++ b/op.c
@@ -6076,8 +6076,8 @@ Perl_ck_glob(pTHX_ OP *o)
     if (!gv) {
        GV *glob_gv;
        ENTER;
-       Perl_load_module(aTHX_ PERL_LOADMOD_NOIMPORT, newSVpvn("File::Glob", 10), Nullsv,
-                        Nullsv, Nullsv);
+       Perl_load_module(aTHX_ PERL_LOADMOD_NOIMPORT,
+               newSVpvn("File::Glob", 10), Nullsv, Nullsv, Nullsv);
        gv = gv_fetchpv("CORE::GLOBAL::glob", FALSE, SVt_PVCV);
        glob_gv = gv_fetchpv("File::Glob::csh_glob", FALSE, SVt_PVCV);
        GvCV(gv) = GvCV(glob_gv);