minor cleanup

p4raw-id: //depot/perl@2112

4 files changed, 7 insertions, 8 deletions

diff --git a/malloc.c b/malloc.c
index 8bfa0dbd36..1b75b676ca 100644
--- a/malloc.c
+++ b/malloc.c
@@ -572,10 +572,10 @@ static char bucket_of[] =
 
 static char *emergency_buffer;
 static MEM_SIZE emergency_buffer_size;
+static Malloc_t emergency_sbrk(MEM_SIZE size);
 
 static Malloc_t
-emergency_sbrk(size)
-    MEM_SIZE size;
+emergency_sbrk(MEM_SIZE size)
 {
     MEM_SIZE rsize = (((size - 1)>>LOG_OF_MIN_ARENA) + 1)<<LOG_OF_MIN_ARENA;
 
@@ -1615,8 +1615,7 @@ static long Perl_sbrk_oldsize;
 #   define PERLSBRK_64_K (1<<16)
 
 Malloc_t
-Perl_sbrk(size)
-int size;
+Perl_sbrk(int size)
 {
     IV got;
     int small, reqsize;
diff --git a/regexec.c b/regexec.c
index 840d9cc7e2..a3a31921ae 100644
--- a/regexec.c
+++ b/regexec.c
@@ -1617,7 +1617,7 @@ regmatch(regnode *prog)
 		    }
 		    if (mg) {
 			re = (regexp *)mg->mg_obj;
-			ReREFCNT_inc(re);
+			(void)ReREFCNT_inc(re);
 		    }
 		    else {
 			STRLEN len;
diff --git a/t/pragma/warn/doio b/t/pragma/warn/doio
index e59b4a0224..da59101071 100644
--- a/t/pragma/warn/doio
+++ b/t/pragma/warn/doio
@@ -86,11 +86,11 @@ use warning 'io' ;
 exec "lskdjfalksdjfdjfkls","" ;
 EXPECT
 OPTION regex
-Can't exec "lskdjfalksdjfdjfkls": (\w+ )?No such file or directory\.? at - line 3.
+Can't exec "lskdjfalksdjfdjfkls": (\w+ )?No such file or directory.*
 ########
 # doio.c
 use warning 'io' ;
 exec "lskdjfalksdjfdjfkls", "abc" ;
 EXPECT
 OPTION regex
-Can't exec "lskdjfalksdjfdjfkls": (\w+ )?No such file or directory\.? at - line 3.
+Can't exec "lskdjfalksdjfdjfkls": (\w+ )?No such file or directory.*
diff --git a/win32/makefile.mk b/win32/makefile.mk
index d12add705b..80f01fa4fb 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -220,7 +220,7 @@ OPTIMIZE	= -O2 $(RUNTIME)
 LINK_DBG	= 
 .ENDIF
 
-CFLAGS		= -w -g0 -d -tWM -tWD $(INCLUDES) $(DEFINES) $(LOCDEFS) \
+CFLAGS		= -w -g0 -a4 -tWM -tWD $(INCLUDES) $(DEFINES) $(LOCDEFS) \
 		$(PCHFLAGS) $(OPTIMIZE)
 LINK_FLAGS	= $(LINK_DBG) -L$(CCLIBDIR) $(EXTRALIBDIRS:^"-L")
 OBJOUT_FLAG	= -o