Integrate with Sarathy.

[p5sagit/p5-mst-13.2.git] / globals.c

diff --git a/globals.c b/globals.c
index b8d7c38..216139d 100644 (file)
--- a/globals.c
+++ b/globals.c
@@ -1,17 +1,21 @@
 #include "INTERN.h"
+#define PERL_IN_GLOBALS_C
 #include "perl.h"
 
 #ifdef PERL_OBJECT
 
 #undef PERLVAR
 #define PERLVAR(x, y)
+#undef PERLVARA
+#define PERLVARA(x, n, y)
 #undef PERLVARI
 #define PERLVARI(x, y, z) PL_##x = z;
 #undef PERLVARIC
 #define PERLVARIC(x, y, z) PL_##x = z;
 
 CPerlObj::CPerlObj(IPerlMem* ipM, IPerlEnv* ipE, IPerlStdIO* ipStd,
-                                            IPerlLIO* ipLIO, IPerlDir* ipD, IPerlSock* ipS, IPerlProc* ipP)
+                  IPerlLIO* ipLIO, IPerlDir* ipD, IPerlSock* ipS,
+                  IPerlProc* ipP)
 {
     memset(((char*)this)+sizeof(void*), 0, sizeof(CPerlObj)-sizeof(void*));
 
@@ -19,37 +23,31 @@ CPerlObj::CPerlObj(IPerlMem* ipM, IPerlEnv* ipE, IPerlStdIO* ipStd,
 #include "intrpvar.h"
 #include "perlvars.h"
 
-    PL_piMem = ipM;
-    PL_piENV = ipE;
-    PL_piStdIO = ipStd;
-    PL_piLIO = ipLIO;
-    PL_piDir = ipD;
-    PL_piSock = ipS;
-    PL_piProc = ipP;
+    PL_Mem = ipM;
+    PL_Env = ipE;
+    PL_StdIO = ipStd;
+    PL_LIO = ipLIO;
+    PL_Dir = ipD;
+    PL_Sock = ipS;
+    PL_Proc = ipP;
 }
 
 void*
 CPerlObj::operator new(size_t nSize, IPerlMem *pvtbl)
 {
     if(pvtbl != NULL)
-       return pvtbl->Malloc(nSize);
+       return pvtbl->pMalloc(pvtbl, nSize);
 
     return NULL;
 }
 
-int&
-CPerlObj::ErrorNo(void)
-{
-    return errno;
-}
-
 void
 CPerlObj::Init(void)
 {
 }
 
 int
-fprintf(PerlIO *stream, const char *format, ...)
+CPerlObj::fprintf(PerlIO *stream, const char *format, ...)
 {
     va_list(arglist);
     va_start(arglist, format);
@@ -58,13 +56,13 @@ fprintf(PerlIO *stream, const char *format, ...)
 
 #ifdef WIN32           /* XXX why are these needed? */
 bool
-do_exec(char *cmd)
+Perl_do_exec(char *cmd)
 {
     return PerlProc_Cmd(cmd);
 }
 
 int
-do_aspawn(void *vreally, void **vmark, void **vsp)
+CPerlObj::do_aspawn(void *vreally, void **vmark, void **vsp)
 {
     return PerlProc_aspawn(vreally, vmark, vsp);
 }