This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Start merge with maint-5.004 branch by creating an ancestral
authorMalcolm Beattie <mbeattie@sable.ox.ac.uk>
Mon, 29 Sep 1997 16:44:16 +0000 (16:44 +0000)
committerMalcolm Beattie <mbeattie@sable.ox.ac.uk>
Mon, 29 Sep 1997 16:44:16 +0000 (16:44 +0000)
branch point via a fake resolution with the maint-merge branch.
See Perforce Tech Note 9 for details.

p4raw-id: //depot/perl@77

1  2 
global.sym
perl.h
pp.c
proto.h
run.c
sv.c

diff --cc global.sym
Simple merge
diff --cc perl.h
--- 1/perl.h
--- 2/perl.h
+++ b/perl.h
@@@ -1389,12 -1339,8 +1387,11 @@@ EXT SV **     stack_max;      /* stack->array_ar
  
  /* likewise for these */
  
 -EXT OP *      op;             /* current op--oughta be in a global register */
 -
 +#ifdef OP_IN_REGISTER
 +EXT OP *      opsave;         /* save current op register across longjmps */
 +#else
 +EXT OP *      op;             /* current op--when not in a global register */
 +#endif
- EXT int               (*runops) _((void)) INIT(RUNOPS_DEFAULT);
  EXT I32 *     scopestack;     /* blocks we've entered */
  EXT I32               scopestack_ix;
  EXT I32               scopestack_max;
diff --cc pp.c
Simple merge
diff --cc proto.h
Simple merge
diff --cc run.c
--- 1/run.c
--- 2/run.c
+++ b/run.c
  dEXT char **watchaddr = 0;
  dEXT char *watchok;
  
+ #ifndef DEBUGGING
  int
- runops_standard() {
+ runops() {
 +    dTHR;
      SAVEI32(runlevel);
      runlevel++;
  
      return 0;
  }
  
- #ifdef DEBUGGING
+ #else
 -static void debprof _((OP*op));
 +static void debprof _((OP*o));
  
  int
- runops_debug() {
+ runops() {
 +    dTHR;
      if (!op) {
        warn("NULL OP IN RUN");
        return 0;
diff --cc sv.c
--- 1/sv.c
--- 2/sv.c
+++ b/sv.c
@@@ -4043,12 -4022,10 +4043,11 @@@ I32 n
  }
  
  SV*
- sv_bless3(sv,stash,zaptilde)
+ sv_bless(sv,stash)
  SV* sv;
  HV* stash;
- bool zaptilde;
  {
 +    dTHR;
      SV *ref;
      if (!SvROK(sv))
          croak("Can't bless non-reference value");