From: Malcolm Beattie <mbeattie@sable.ox.ac.uk>
Date: Mon, 29 Sep 1997 16:44:16 +0000 (+0000)
Subject: Start merge with maint-5.004 branch by creating an ancestral
X-Git-Tag: perl-5.005~850
X-Git-Url: https://perl5.git.perl.org/perl5.git/commitdiff_plain/8f95159f0f6f551c08c5f6e1a4d8807b332bc21a

Start merge with maint-5.004 branch by creating an ancestral
branch point via a fake resolution with the maint-merge branch.
See Perforce Tech Note 9 for details.

p4raw-id: //depot/perl@77
---

8f95159f0f6f551c08c5f6e1a4d8807b332bc21a
diff --cc perl.h
index 70d9a63,77ffb53..5ef7cd9
--- a/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 run.c
index 1e1001d,0ce2b9f..2f8d8fa
--- a/run.c
+++ b/run.c
@@@ -19,9 -19,10 +19,11 @@@
  dEXT char **watchaddr = 0;
  dEXT char *watchok;
  
+ #ifndef DEBUGGING
+ 
  int
- runops_standard() {
+ runops() {
 +    dTHR;
      SAVEI32(runlevel);
      runlevel++;
  
@@@ -31,12 -32,12 +33,13 @@@
      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
index 1c58c46,ece94b9..cd55f81
--- a/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");