This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Merge changes as of 18:00 CST
authorNick Ing-Simmons <nik@tiuk.ti.com>
Fri, 7 Nov 1997 23:59:31 +0000 (23:59 +0000)
committerNick Ing-Simmons <nik@tiuk.ti.com>
Fri, 7 Nov 1997 23:59:31 +0000 (23:59 +0000)
p4raw-id: //depot/ansiperl@211

1  2 
op.c
pp.c
pp_sys.c
util.c

diff --cc op.c
--- 1/op.c
--- 2/op.c
+++ b/op.c
@@@ -3466,9 -3615,11 +3466,8 @@@ newSUB(I32 floor, OP *o, OP *proto, OP 
      return cv;
  }
  
  CV *
 -newXS(name, subaddr, filename)
 -char *name;
 -void (*subaddr) _((CV*));
 -char *filename;
 +newXS(char *name, void (*subaddr) (CV *), char *filename)
  {
      dTHR;
      GV *gv = gv_fetchpv(name ? name : "__ANON__", GV_ADDMULTI, SVt_PVCV);
diff --cc pp.c
--- 1/pp.c
--- 2/pp.c
+++ b/pp.c
@@@ -4297,8 -4298,8 +4297,8 @@@ PP(pp_lock
  
  PP(pp_specific)
  {
- #ifdef USE_THREADS
 -    dSP;
 +    djSP;
+ #ifdef USE_THREADS
      SV **svp = av_fetch(thr->magicals, op->op_targ, FALSE);
      if (!svp)
        croak("panic: pp_specific");
diff --cc pp_sys.c
Simple merge
diff --cc util.c
Simple merge