From: Nick Ing-Simmons <nik@tiuk.ti.com>
Date: Fri, 7 Nov 1997 23:59:31 +0000 (+0000)
Subject: Merge changes as of 18:00 CST
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=d59a3bff4895759de00a35ae929c24707c4ad061;p=p5sagit%2Fp5-mst-13.2.git

Merge changes as of 18:00 CST

p4raw-id: //depot/ansiperl@211
---

d59a3bff4895759de00a35ae929c24707c4ad061
diff --cc op.c
index 2f79a6f,3bd44fc..1c866f7
--- a/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
index 3df5340,c2585ae..143df7c
--- a/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");