Drat. #33298 doesn't fix it: need this too.

And even then I now get an assertion from win32.c line 628. Sigh...

p4raw-id: //depot/perl@33299

diff --git a/embed.fnc b/embed.fnc
index 8d6dda2..3d8c4b1 100644 (file)
--- a/embed.fnc
+++ b/embed.fnc
@@ -67,12 +67,17 @@ AnpR        |bool   |doing_taint    |int argc|NULLOK char** argv|NULLOK char** env
 Anod   |PerlInterpreter*|perl_clone|NN PerlInterpreter *proto_perl|UV flags
 #  if defined(PERL_IMPLICIT_SYS)
 Ano    |PerlInterpreter*|perl_clone_using \
-                               |NN PerlInterpreter *proto_perl|UV flags \
-                               |NN struct IPerlMem* m|NN struct IPerlMem* ms \
-                               |NN struct IPerlMem* mp|NN struct IPerlEnv* e \
-                               |NN struct IPerlStdIO* io|NN struct IPerlLIO* lio \
-                               |NN struct IPerlDir* d|NN struct IPerlSock* s \
-                               |NN struct IPerlProc* p
+                               |NN PerlInterpreter *proto_perl \
+                               |UV flags \
+                               |NN struct IPerlMem* ipM \
+                               |NN struct IPerlMem* ipMS \
+                               |NN struct IPerlMem* ipMP \
+                               |NN struct IPerlEnv* ipE \
+                               |NN struct IPerlStdIO* ipStd \
+                               |NN struct IPerlLIO* ipLIO \
+                               |NN struct IPerlDir* ipD \
+                               |NN struct IPerlSock* ipS \
+                               |NN struct IPerlProc* ipP
 #  endif
 #endif
 

diff --git a/proto.h b/proto.h
index 86beec7..cd6aac5 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -69,7 +69,7 @@ PERL_CALLCONV PerlInterpreter*        perl_clone(PerlInterpreter *proto_perl, UV flags)
        assert(proto_perl)
 
 #  if defined(PERL_IMPLICIT_SYS)
-PERL_CALLCONV PerlInterpreter* perl_clone_using(PerlInterpreter *proto_perl, UV flags, struct IPerlMem* m, struct IPerlMem* ms, struct IPerlMem* mp, struct IPerlEnv* e, struct IPerlStdIO* io, struct IPerlLIO* lio, struct IPerlDir* d, struct IPerlSock* s, struct IPerlProc* p)
+PERL_CALLCONV PerlInterpreter* perl_clone_using(PerlInterpreter *proto_perl, UV flags, struct IPerlMem* ipM, struct IPerlMem* ipMS, struct IPerlMem* ipMP, struct IPerlEnv* ipE, struct IPerlStdIO* ipStd, struct IPerlLIO* ipLIO, struct IPerlDir* ipD, struct IPerlSock* ipS, struct IPerlProc* ipP)
                        __attribute__nonnull__(1)
                        __attribute__nonnull__(3)
                        __attribute__nonnull__(4)
@@ -81,7 +81,7 @@ PERL_CALLCONV PerlInterpreter*        perl_clone_using(PerlInterpreter *proto_perl, UV
                        __attribute__nonnull__(10)
                        __attribute__nonnull__(11);
 #define PERL_ARGS_ASSERT_PERL_CLONE_USING      \
-       assert(proto_perl); assert(m); assert(ms); assert(mp); assert(e); assert(io); assert(lio); assert(d); assert(s); assert(p)
+       assert(proto_perl); assert(ipM); assert(ipMS); assert(ipMP); assert(ipE); assert(ipStd); assert(ipLIO); assert(ipD); assert(ipS); assert(ipP)
 
 #  endif
 #endif