X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=globals.c;h=3c9c9407a7a908688ef0e7ee512668b101bbbd0d;hb=4b647fb0fbdf8961608035051911f2c5e7a00c2b;hp=857a32c78adfa7cb5ba973b2df66798b748ad5d4;hpb=cea2e8a9dd23747fd2b66edc86c58c64e9970321;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/globals.c b/globals.c
index 857a32c..3c9c940 100644
--- a/globals.c
+++ b/globals.c
@@ -2,66 +2,22 @@
 #define PERL_IN_GLOBALS_C
 #include "perl.h"
 
-#ifdef PERL_OBJECT
-
-#undef PERLVAR
-#define PERLVAR(x, 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_piMem = ipM;
-    PL_piENV = ipE;
-    PL_piStdIO = ipStd;
-    PL_piLIO = ipLIO;
-    PL_piDir = ipD;
-    PL_piSock = ipS;
-    PL_piProc = ipP;
-}
-
-void*
-CPerlObj::operator new(size_t nSize, IPerlMem *pvtbl)
-{
-    if(pvtbl != NULL)
-	return pvtbl->Malloc(nSize);
-
-    return NULL;
-}
-
-int&
-CPerlObj::ErrorNo(void)
-{
-    return errno;
-}
-
-void
-CPerlObj::Init(void)
-{
-}
-
-#ifdef WIN32		/* XXX why are these needed? */
-bool
-Perl_do_exec(pTHX_ char *cmd)
+int
+Perl_fprintf_nocontext(PerlIO *stream, const char *format, ...)
 {
-    return PerlProc_Cmd(cmd);
+    dTHXs;
+    va_list(arglist);
+    va_start(arglist, format);
+    return PerlIO_vprintf(stream, format, arglist);
 }
 
 int
-S_do_aspawn(pTHX_ void *vreally, void **vmark, void **vsp)
+Perl_printf_nocontext(const char *format, ...)
 {
-    return PerlProc_aspawn(vreally, vmark, vsp);
+    dTHXs;
+    va_list(arglist);
+    va_start(arglist, format);
+    return PerlIO_vprintf(PerlIO_stdout(), format, arglist);
 }
-#endif  /* WIN32 */
 
-#endif   /* PERL_OBJECT */
+#include "perlapi.h"		/* bring in PL_force_link_funcs */