applied patch, tweaked wording

[p5sagit/p5-mst-13.2.git] / opcode.h

diff --git a/opcode.h b/opcode.h
index b560369..62a7a33 100644 (file)
--- a/opcode.h
+++ b/opcode.h
@@ -1061,6 +1061,9 @@ EXT char *op_desc[] = {
 };
 #endif
 
+#ifndef PERL_OBJECT
+START_EXTERN_C
+
 OP *   ck_anoncode     _((OP* o));
 OP *   ck_bitop        _((OP* o));
 OP *   ck_concat       _((OP* o));
@@ -1441,10 +1444,14 @@ OP *    pp_syscall      _((ARGSproto));
 OP *   pp_lock         _((ARGSproto));
 OP *   pp_threadsv     _((ARGSproto));
 
+END_EXTERN_C
+#endif  /* PERL_OBJECT */
+
 #ifndef DOINIT
-EXT OP * (*ppaddr[])();
+EXT OP * (CPERLscope(*ppaddr)[])(ARGSproto);
 #else
-EXT OP * (*ppaddr[])() = {
+#ifndef PERL_OBJECT
+EXT OP * (CPERLscope(*ppaddr)[])(ARGSproto) = {
        pp_null,
        pp_stub,
        pp_scalar,
@@ -1792,12 +1799,14 @@ EXT OP * (*ppaddr[])() = {
        pp_lock,
        pp_threadsv,
 };
+#endif  /* PERL_OBJECT */
 #endif
 
-#ifndef DOINIT
-EXT OP * (*check[]) _((OP *op));
+#ifndef DOINIT 
+EXT OP * (CPERLscope(*check)[]) _((OP *op));
 #else
-EXT OP * (*check[]) _((OP *op)) = {
+#ifndef PERL_OBJECT
+EXT OP * (CPERLscope(*check)[]) _((OP *op)) = {
        ck_null,        /* null */
        ck_null,        /* stub */
        ck_fun,         /* scalar */
@@ -2145,6 +2154,7 @@ EXT OP * (*check[]) _((OP *op)) = {
        ck_rfun,        /* lock */
        ck_null,        /* threadsv */
 };
+#endif  /* PERL_OBJECT */
 #endif
 
 #ifndef DOINIT
@@ -2260,7 +2270,7 @@ EXT U32 opargs[] = {
        0x00009c8e,     /* oct */
        0x00009c8e,     /* abs */
        0x00009c9c,     /* length */
-       0x0091150c,     /* substr */
+       0x0991150c,     /* substr */
        0x0011151c,     /* vec */
        0x0091151c,     /* index */
        0x0091151c,     /* rindex */