X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=globals.c;h=0782eba226f69ebbef5875817815c6c643947dde;hb=9fa0c281d33904ea68dd99db7ecfc2e9e4b0aeeb;hp=9777273ee6a4564f2446467a3faf08795f951fcb;hpb=3075ddba723b9b3d732695035818e7b3e7287e85;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/globals.c b/globals.c
index 9777273..0782eba 100644
--- a/globals.c
+++ b/globals.c
@@ -9,11 +9,12 @@
 #undef PERLVARA
 #define PERLVARA(x, n, y)
 #undef PERLVARI
-#define PERLVARI(x, y, z) PL_##x = z;
+#define PERLVARI(x, y, z) interp.x = z;
 #undef PERLVARIC
-#define PERLVARIC(x, y, z) PL_##x = z;
+#define PERLVARIC(x, y, z) interp.x = z;
 
-CPerlObj::CPerlObj(IPerlMem* ipM, IPerlEnv* ipE, IPerlStdIO* ipStd,
+CPerlObj::CPerlObj(IPerlMem* ipM, IPerlMem* ipMS, IPerlMem* ipMP,
+		   IPerlEnv* ipE, IPerlStdIO* ipStd,
 		   IPerlLIO* ipLIO, IPerlDir* ipD, IPerlSock* ipS,
 		   IPerlProc* ipP)
 {
@@ -21,9 +22,10 @@ CPerlObj::CPerlObj(IPerlMem* ipM, IPerlEnv* ipE, IPerlStdIO* ipStd,
 
 #include "thrdvar.h"
 #include "intrpvar.h"
-#include "perlvars.h"
 
     PL_Mem = ipM;
+    PL_MemShared = ipMS;
+    PL_MemParse = ipMP;
     PL_Env = ipE;
     PL_StdIO = ipStd;
     PL_LIO = ipLIO;
@@ -37,21 +39,20 @@ CPerlObj::operator new(size_t nSize, IPerlMem *pvtbl)
 {
     if(pvtbl)
 	return pvtbl->pMalloc(pvtbl, nSize);
-
+#ifndef __MINGW32__
+    /* operator new is supposed to throw std::bad_alloc */
     return NULL;
+#endif
 }
 
+#ifndef __BORLANDC__
 void
 CPerlObj::operator delete(void *pPerl, IPerlMem *pvtbl)
 {
     if(pvtbl)
 	pvtbl->pFree(pvtbl, pPerl);
 }
-
-void
-CPerlObj::Init(void)
-{
-}
+#endif
 
 #ifdef WIN32		/* XXX why are these needed? */
 bool
@@ -77,3 +78,5 @@ Perl_fprintf_nocontext(PerlIO *stream, const char *format, ...)
     va_start(arglist, format);
     return PerlIO_vprintf(stream, format, arglist);
 }
+
+#include "perlapi.h"		/* bring in PL_force_link_funcs */