#define pp_rcatline CPerlObj::Perl_pp_rcatline
#undef pp_regcmaybe
#define pp_regcmaybe CPerlObj::Perl_pp_regcmaybe
+#undef pp_regcreset
+#define pp_regcreset CPerlObj::Perl_pp_regcreset
#undef pp_regcomp
#define pp_regcomp CPerlObj::Perl_pp_regcomp
#undef pp_match
#define pp_match CPerlObj::Perl_pp_match
+#undef pp_qr
+#define pp_qr CPerlObj::Perl_pp_qr
#undef pp_subst
#define pp_subst CPerlObj::Perl_pp_subst
#undef pp_substcont
ck_null, /* readline */
ck_null, /* rcatline */
ck_fun, /* regcmaybe */
+ ck_fun, /* regcreset */
ck_null, /* regcomp */
ck_match, /* match */
+ ck_match, /* qr */
ck_null, /* subst */
ck_null, /* substcont */
ck_null, /* trans */
pp_readline,
pp_rcatline,
pp_regcmaybe,
+ pp_regcreset,
pp_regcomp,
pp_match,
+ pp_qr,
pp_subst,
pp_substcont,
pp_trans,
#undef PERLVAR
#define PERLVAR(x, y)
#undef PERLVARI
-#define PERLVARI(x, y, z) x = z;
+#define PERLVARI(x, y, z) PL_##x = z;
#undef PERLVARIC
-#define PERLVARIC(x, y, z) x = z;
+#define PERLVARIC(x, y, z) PL_##x = z;
CPerlObj::CPerlObj(IPerlMem* ipM, IPerlEnv* ipE, IPerlStdIO* ipStd,
IPerlLIO* ipLIO, IPerlDir* ipD, IPerlSock* ipS, IPerlProc* ipP)
#include "intrpvar.h"
#include "perlvars.h"
- piMem = ipM;
- piENV = ipE;
- piStdIO = ipStd;
- piLIO = ipLIO;
- piDir = ipD;
- piSock = ipS;
- piProc = ipP;
+ PL_piMem = ipM;
+ PL_piENV = ipE;
+ PL_piStdIO = ipStd;
+ PL_piLIO = ipLIO;
+ PL_piDir = ipD;
+ PL_piSock = ipS;
+ PL_piProc = ipP;
}
void*
int&
CPerlObj::ErrorNo(void)
{
- return error_no;
+ return errno;
}
void
CPerlObj::Init(void)
{
-#ifdef WIN32
- New(2904, environ, 1, char*);
- *environ = NULL;
-#endif
}
-#ifdef WIN32
+#ifdef WIN32 /* XXX why are these needed? */
bool
do_exec(char *cmd)
{