Changes to allow compiler with gcc-2.8.1 in C++ mode,

Remove K&R style functions, avoid struct/typedef clash.

p4raw-id: //depot/ansiperl@972

4 files changed, 5 insertions, 9 deletions

diff --git a/bytecode.h b/bytecode.h
index e86c146505..6640ce9b16 100644
--- a/bytecode.h
+++ b/bytecode.h
@@ -2,7 +2,7 @@ typedef char *pvcontents;
 typedef char *strconst;
 typedef U32 PV;
 typedef char *op_tr_array;
-typedef int comment;
+typedef int comment_t;
 typedef SV *svindex;
 typedef OP *opindex;
 typedef IV IV64;
diff --git a/byterun.c b/byterun.c
index c99fa0850e..1c4ceb5994 100644
--- a/byterun.c
+++ b/byterun.c
@@ -38,7 +38,7 @@ void byterun(PerlIO *fp)
 	switch (insn) {
 	  case INSN_COMMENT:		/* 35 */
 	    {
-		comment arg;
+		comment_t arg;
 		BGET_comment(arg);
 		arg = arg;
 		break;
diff --git a/sv.c b/sv.c
index ff9986771e..193734e674 100644
--- a/sv.c
+++ b/sv.c
@@ -3558,9 +3558,7 @@ newSVpv(char *s, STRLEN len)
 }
 
 SV *
-newSVpvn(s,len)
-char *s;
-STRLEN len;
+newSVpvn(char *s, STRLEN len)
 {
     register SV *sv;
 
diff --git a/toke.c b/toke.c
index 5605938274..d448e75328 100644
--- a/toke.c
+++ b/toke.c
@@ -318,16 +318,14 @@ restore_rsfp(void *f)
 }
 
 static void
-restore_expect(e)
-void *e;
+restore_expect(void *e)
 {
     /* a safe way to store a small integer in a pointer */
     expect = (expectation)((char *)e - tokenbuf);
 }
 
 static void
-restore_lex_expect(e)
-void *e;
+restore_lex_expect(void *e)
 {
     /* a safe way to store a small integer in a pointer */
     lex_expect = (expectation)((char *)e - tokenbuf);