3 files changed, 12 insertions, 11 deletions

diff --git a/embed.pl b/embed.pl
index 836e816166..ca489c5b2f 100755
--- a/embed.pl
+++ b/embed.pl
@@ -98,7 +98,8 @@ sub multon ($$$) {
 }
 sub multoff ($$) {
     my ($sym,$pre) = @_;
-    hide("$pre$sym", "PL_$sym");
+#   hide("$pre$sym", "PL_$sym");
+    return '';
 }
 
 unlink 'embed.h';
@@ -171,7 +172,7 @@ print EM <<'END';
 END
 
 for $sym (sort keys %thread) {
-    print EM multon($sym,'T','curinterp->');
+    print EM multon($sym,'T','PL_curinterp->');
 }
 
 print EM <<'END';
@@ -183,7 +184,7 @@ print EM <<'END';
 END
 
 for $sym (sort keys %intrp) {
-    print EM multon($sym,'I','curinterp->');
+    print EM multon($sym,'I','PL_curinterp->');
 }
 
 print EM <<'END';
diff --git a/perl.c b/perl.c
index b3f76ebff9..7c42698042 100644
--- a/perl.c
+++ b/perl.c
@@ -112,7 +112,7 @@ perl_construct(register PerlInterpreter *sv_interp)
 #endif
 
 #ifdef MULTIPLICITY
-    ++ninterps;
+    ++PL_ninterps;
     Zero(sv_interp, 1, PerlInterpreter);
 #endif
 
@@ -189,7 +189,7 @@ perl_construct(register PerlInterpreter *sv_interp)
     init_stacks(ARGS);
 #ifdef MULTIPLICITY
     init_interp();
-    perl_destruct_level = 1; 
+    PL_perl_destruct_level = 1; 
 #else
    if (PL_perl_destruct_level > 0)
        init_interp();
@@ -337,7 +337,7 @@ perl_destruct(register PerlInterpreter *sv_interp)
     FREETMPS;
 
 #ifdef MULTIPLICITY
-    --ninterps;
+    --PL_ninterps;
 #endif
 
     /* We must account for everything.  */
@@ -804,7 +804,7 @@ setuid perl scripts securely.\n");
 		sv_catpv(Sv," NO_EMBED");
 #  endif
 #  ifdef MULTIPLICITY
-		sv_catpv(Sv," MULTIPLICITY");
+		sv_catpv(PL_Sv," MULTIPLICITY");
 #  endif
 		sv_catpv(PL_Sv,"\\n\",");
 #endif
@@ -1841,8 +1841,8 @@ init_interp(void)
 #else
 #  ifdef MULTIPLICITY
 #    define PERLVAR(var,type)
-#    define PERLVARI(var,type,init)	curinterp->var = init;
-#    define PERLVARIC(var,type,init)	curinterp->var = init;
+#    define PERLVARI(var,type,init)	PL_curinterp->var = init;
+#    define PERLVARIC(var,type,init)	PL_curinterp->var = init;
 #    include "intrpvar.h"
 #    ifndef USE_THREADS
 #      include "thrdvar.h"
diff --git a/toke.c b/toke.c
index a4feb01e32..23f6ac1ad4 100644
--- a/toke.c
+++ b/toke.c
@@ -453,8 +453,8 @@ uni(I32 f, char *s)
     yylval.ival = f;
     PL_expect = XTERM;
     PL_bufptr = s;
-    last_uni = oldbufptr;
-    last_lop_op = f;
+    PL_last_uni = PL_oldbufptr;
+    PL_last_lop_op = f;
     if (*s == '(')
 	return FUNC1;
     s = skipspace(s);