This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Integrate with Sarathy.
authorJarkko Hietaniemi <jhi@iki.fi>
Thu, 11 Nov 1999 19:48:21 +0000 (19:48 +0000)
committerJarkko Hietaniemi <jhi@iki.fi>
Thu, 11 Nov 1999 19:48:21 +0000 (19:48 +0000)
p4raw-id: //depot/cfgperl@4549

14 files changed:
1  2 
doio.c
dump.c
ext/B/B.xs
op.c
op.h
opcode.pl
perl.h
perlapi.c
pp_hot.c
pp_sys.c
run.c
scope.c
sv.c
util.c

diff --cc doio.c
Simple merge
diff --cc dump.c
Simple merge
diff --cc ext/B/B.xs
Simple merge
diff --cc op.c
Simple merge
diff --cc op.h
Simple merge
diff --cc opcode.pl
Simple merge
diff --cc perl.h
Simple merge
diff --cc perlapi.c
index 41dd32a,6ea713c..6ea713c
mode 100755,100644..100755
+++ b/perlapi.c
diff --cc pp_hot.c
Simple merge
diff --cc pp_sys.c
+++ b/pp_sys.c
@@@ -2913,10 -2896,9 +2913,10 @@@ PP(pp_fttext
      register SV *sv;
      GV *gv;
      STRLEN n_a;
 +    PerlIO *fp;
  
      if (PL_op->op_flags & OPf_REF)
-       gv = (GV*)cSVOP->op_sv;
+       gv = cGVOP;
      else if (isGV(TOPs))
        gv = (GV*)POPs;
      else if (SvROK(TOPs) && isGV(SvRV(TOPs)))
diff --cc run.c
Simple merge
diff --cc scope.c
Simple merge
diff --cc sv.c
Simple merge
diff --cc util.c
Simple merge