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

diff --git a/globals.c b/globals.c
index 9777273..d18c868 100644
--- a/globals.c
+++ b/globals.c
@@ -2,78 +2,22 @@
 #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)
-{
-    memset(((char*)this)+sizeof(void*), 0, sizeof(CPerlObj)-sizeof(void*));
-
-#include "thrdvar.h"
-#include "intrpvar.h"
-#include "perlvars.h"
-
-    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)
-	return pvtbl->pMalloc(pvtbl, nSize);
-
-    return NULL;
-}
-
-void
-CPerlObj::operator delete(void *pPerl, IPerlMem *pvtbl)
-{
-    if(pvtbl)
-	pvtbl->pFree(pvtbl, pPerl);
-}
-
-void
-CPerlObj::Init(void)
-{
-}
-
-#ifdef WIN32		/* XXX why are these needed? */
-bool
-Perl_do_exec(char *cmd)
-{
-    return PerlProc_Cmd(cmd);
-}
-
 int
-CPerlObj::do_aspawn(void *vreally, void **vmark, void **vsp)
+Perl_fprintf_nocontext(PerlIO *stream, const char *format, ...)
 {
-    return PerlProc_aspawn(vreally, vmark, vsp);
+    dTHXs;
+    va_list(arglist);
+    va_start(arglist, format);
+    return PerlIO_vprintf(stream, format, arglist);
 }
-#endif  /* WIN32 */
-
-#endif   /* PERL_OBJECT */
 
 int
-Perl_fprintf_nocontext(PerlIO *stream, const char *format, ...)
+Perl_printf_nocontext(const char *format, ...)
 {
     dTHX;
     va_list(arglist);
     va_start(arglist, format);
-    return PerlIO_vprintf(stream, format, arglist);
+    return PerlIO_vprintf(PerlIO_stdout(), format, arglist);
 }
+
+#include "perlapi.h"		/* bring in PL_force_link_funcs */