Re: Solaris build warnings

Message-ID: <Pine.LNX.4.64.0803261337130.22919@fractal.phys.lafayette.edu>

Rename the "optype" typedef to "Optype"

p4raw-id: //depot/perl@33679

diff --git a/op.c b/op.c
index 11b29d8..21aa23d 100644 (file)
--- a/op.c
+++ b/op.c
@@ -548,7 +548,7 @@ Perl_op_clear(pTHX_ OP *o)
     switch (o->op_type) {
     case OP_NULL:      /* Was holding old type, if any. */
        if (PL_madskills && o->op_targ != OP_NULL) {
-           o->op_type = (optype)o->op_targ;
+           o->op_type = (Optype)o->op_targ;
            o->op_targ = 0;
            goto retry;
        }
@@ -5057,7 +5057,7 @@ S_newGIVWHENOP(pTHX_ OP *cond, OP *block,
     PERL_ARGS_ASSERT_NEWGIVWHENOP;
 
     NewOp(1101, enterop, 1, LOGOP);
-    enterop->op_type = (optype)enter_opcode;
+    enterop->op_type = (Optype)enter_opcode;
     enterop->op_ppaddr = PL_ppaddr[enter_opcode];
     enterop->op_flags =  (U8) OPf_KIDS;
     enterop->op_targ = ((entertarg == NOT_IN_PAD) ? 0 : entertarg);

diff --git a/op.h b/op.h
index 4ad2a2b..a5cd625 100644 (file)
--- a/op.h
+++ b/op.h
@@ -45,7 +45,7 @@
 #  define MADPROP_IN_BASEOP
 #endif
 
-typedef PERL_BITFIELD16 optype;
+typedef PERL_BITFIELD16 Optype;
 
 #ifdef BASEOP_DEFINITION
 #define BASEOP BASEOP_DEFINITION