[asperl] integrate mainline changes

p4raw-id: //depot/asperl@1055

1 files changed, 3 insertions, 16 deletions

diff --git a/regcomp.c b/regcomp.c
index 6815e13b2e..b6d8b01c3f 100644
--- a/regcomp.c
+++ b/regcomp.c
@@ -2292,7 +2292,7 @@ dumpuntil(regnode *start, regnode *node, regnode *last, SV* sv, I32 l)
 	else if (op == WHILEM)
 	    l--;
     }
-#endif /* DEBUGGING */
+#endif	/* DEBUGGING */
     return node;
 }
 
@@ -2355,7 +2355,7 @@ regdump(regexp *r)
 	PerlIO_printf(Perl_debug_log, "implicit ");
     PerlIO_printf(Perl_debug_log, "minlen %ld ", (long) r->minlen);
     PerlIO_printf(Perl_debug_log, "\n");
-#endif /* DEBUGGING */
+#endif	/* DEBUGGING */
 }
 
 /*
@@ -2562,7 +2562,7 @@ regprop(SV *sv, regnode *o)
     }
     if (p)
 	sv_catpv(sv, p);
-#endif /* DEBUGGING */
+#endif	/* DEBUGGING */
 }
 
 void
@@ -2633,17 +2633,8 @@ regnext(register regnode *p)
 #endif
 }
 
-#ifdef I_STDARG
 STATIC void	
 re_croak2(const char* pat1,const char* pat2,...)
-#else
-/*VARARGS0*/
-static void	
-re_croak2(const char* pat1,const char* pat2, va_alist)
-    const char* pat1;
-    const char* pat2;
-    va_dcl
-#endif 
 {
     va_list args;
     STRLEN l1 = strlen(pat1);
@@ -2659,11 +2650,7 @@ re_croak2(const char* pat1,const char* pat2, va_alist)
     Copy(pat2, buf + l1, l2 , char);
     buf[l1 + l2 + 1] = '\n';
     buf[l1 + l2 + 2] = '\0';
-#ifdef I_STDARG
     va_start(args, pat2);
-#else
-    va_start(args);
-#endif
     message = mess(buf, &args);
     va_end(args);
     l1 = strlen(message);