Change 34033 by [EMAIL PROTECTED] on 2008/06/08 21:27:42
Integrate:
[ 33978]
Subject: [perl #54828] perlio.c has a problem (both 5.8 and 5.10)
From: "Goro Fuji" (via RT) <[EMAIL PROTECTED]>
Date: Sun, 25 May 2008 23:10:42 -0700
Message-ID: <[EMAIL PROTECTED]>
First chunk of the patch only
[ 34002]
Subject: [perl #55302] cc_runtime syntax error
From: "Reini Urban via RT" <[EMAIL PROTECTED]>
Date: Wed, 04 Jun 2008 14:07:05 -0700
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
... //depot/maint-5.10/perl/cc_runtime.h#2 integrate
... //depot/maint-5.10/perl/perlio.c#8 integrate
Differences ...
==== //depot/maint-5.10/perl/cc_runtime.h#2 (text) ====
Index: perl/cc_runtime.h
--- perl/cc_runtime.h#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/cc_runtime.h 2008-06-08 14:27:42.000000000 -0700
@@ -54,7 +54,7 @@
switch (ret) { \
case 0: \
PL_op = ppaddr(aTHX); \
- if (PL_op != nxt) CALLRUNOPS(); \
+ if (PL_op != nxt) CALLRUNOPS(aTHX); \
JMPENV_POP; \
break; \
case 1: JMPENV_POP; JMPENV_JUMP(1); \
==== //depot/maint-5.10/perl/perlio.c#8 (text) ====
Index: perl/perlio.c
--- perl/perlio.c#7~33947~ 2008-05-28 18:09:23.000000000 -0700
+++ perl/perlio.c 2008-06-08 14:27:42.000000000 -0700
@@ -1290,7 +1290,7 @@
while (t && (l = *t)) {
if (l->tab->Binmode) {
/* Has a handler - normal case */
- if ((*l->tab->Binmode)(aTHX_ f) == 0) {
+ if ((*l->tab->Binmode)(aTHX_ t) == 0) {
if (*t == l) {
/* Layer still there - move down a layer */
t = PerlIONext(t);
End of Patch.
