up patchlevel to 74; introduce distinct archname for PERL_OBJECT

[p5sagit/p5-mst-13.2.git] / globals.c

diff --git a/globals.c b/globals.c
index 320b8df..249e69b 100644 (file)
--- 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)
 {
@@ -1464,14 +1468,4 @@ do_aspawn(void *vreally, void **vmark, void **vsp)
 }
 #endif  /* WIN32 */
 
-#ifndef DEBUGGING
-/* create a matching set of virtual entries for the non debugging version */
-void   CPerlObj::deb_place_holder _((const char* pat,...)) {};
-void   CPerlObj::deb_growlevel_place_holder _((void)) {};
-void   CPerlObj::debprofdump_place_holder _((void)) {};
-I32    CPerlObj::debop_place_holder _((OP* o)) { return 0; };
-I32    CPerlObj::debstack_place_holder _((void)) { return 0; };
-I32    CPerlObj::debstackptrs_place_holder _((void)) { return 0; };
-#endif
-
 #endif   /* PERL_OBJECT */