X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=globals.c;h=3c9c9407a7a908688ef0e7ee512668b101bbbd0d;hb=43c344fe72d16017dc10e89f633aa363dc10f20d;hp=b8d7c38c994826547b454803061d97b17a2bc8e0;hpb=22c35a8c2392967a5ba6b5370695be464bd7012c;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/globals.c b/globals.c
index b8d7c38..3c9c940 100644
--- a/globals.c
+++ b/globals.c
@@ -1,73 +1,23 @@
 #include "INTERN.h"
+#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)
-{
-}
-
 int
-fprintf(PerlIO *stream, const char *format, ...)
+Perl_fprintf_nocontext(PerlIO *stream, const char *format, ...)
 {
+    dTHXs;
     va_list(arglist);
     va_start(arglist, format);
     return PerlIO_vprintf(stream, format, arglist);
 }
 
-#ifdef WIN32		/* XXX why are these needed? */
-bool
-do_exec(char *cmd)
-{
-    return PerlProc_Cmd(cmd);
-}
-
 int
-do_aspawn(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 */