X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=globals.c;h=249e69b0b4cdf0f62ed5b6d9d2ac99a059c33f31;hb=9b6570b4f9243e4e8b953fb4650b22aab639eabc;hp=e3ca27e76a754c94875a8f6c1cea59ff7dcaa885;hpb=35ff78560a01016ce2a3dffe29f18ce851bc0b90;p=p5sagit%2Fp5-mst-13.2.git diff --git a/globals.c b/globals.c index e3ca27e..249e69b 100644 --- a/globals.c +++ b/globals.c @@ -60,10 +60,14 @@ #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 @@ -725,8 +729,10 @@ OP * (CPERLscope(*check)[]) _((OP *op)) = { 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 */ @@ -1074,8 +1080,10 @@ OP * (CPERLscope(*ppaddr)[])(ARGSproto) = { pp_readline, pp_rcatline, pp_regcmaybe, + pp_regcreset, pp_regcomp, pp_match, + pp_qr, pp_subst, pp_substcont, pp_trans, @@ -1438,19 +1446,15 @@ CPerlObj::operator new(size_t nSize, IPerlMem *pvtbl) 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) {