[win32] fix misapplied hunks in change#614

p4raw-link: @614 on //depot/win32/perl: 161b7d1635bc830b9c733355ab423626eadf9ae9

p4raw-id: //depot/win32/perl@616

diff --git a/scope.c b/scope.c
index 33569da..65ac0b5 100644 (file)
--- a/scope.c
+++ b/scope.c
@@ -433,11 +433,7 @@ save_delete(HV *hv, char *key, I32 klen)
 }
 
 void
-save_list(register SV **sarg, I32 maxsarg)
-save_aelem(av,idx,sptr)
-AV *av;
-I32 idx;
-SV **sptr;
+save_aelem(AV *av, I32 idx, SV **sptr)
 {
     SSCHECK(4);
     SSPUSHPTR(av);
@@ -448,10 +444,7 @@ SV **sptr;
 }
 
 void
-save_helem(hv,key,sptr)
-HV *hv;
-SV *key;
-SV **sptr;
+save_helem(HV *hv, SV *key, SV **sptr)
 {
     SSCHECK(4);
     SSPUSHPTR(hv);
@@ -462,6 +455,7 @@ SV **sptr;
 }
 
 void
+save_list(register SV **sarg, I32 maxsarg)
 {
     dTHR;
     register SV *sv;

diff --git a/scope.h b/scope.h
index 580a730..0b9a483 100644 (file)
--- a/scope.h
+++ b/scope.h
@@ -24,7 +24,7 @@
 #define SAVEt_I16      23
 #define SAVEt_AELEM     24
 #define SAVEt_HELEM     25
-#define SAVEt_OP       24
+#define SAVEt_OP       26
 
 #define SSCHECK(need) if (savestack_ix + need > savestack_max) savestack_grow()
 #define SSPUSHINT(i) (savestack[savestack_ix++].any_i32 = (I32)(i))