X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl.c;h=188e193f41c3e8d230e2546476aa8e1364c59598;hb=60099296ceae90f439675352184edd07019ec071;hp=e6bb9ddcf10c3b556c9e4116331aa5a3042e46b9;hpb=9f653bb54868b8547466924d4ce483acb8987efb;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/perl.c b/perl.c
index e6bb9dd..188e193 100644
--- a/perl.c
+++ b/perl.c
@@ -258,7 +258,7 @@ perl_construct(pTHXx)
 	    SvREFCNT(&PL_sv_placeholder) = (~(U32)0)/2;
 	}
 
-	PL_sighandlerp = Perl_sighandler;
+	PL_sighandlerp = (Sighandler_t) Perl_sighandler;
 	PL_pidstatus = newHV();
     }
 
@@ -1685,9 +1685,8 @@ S_parse_body(pTHX_ char **env, XSINIT_t xsinit)
 		argc--,argv++;
 	    }
 	    if (s && *s) {
-		char *p;
 		STRLEN len = strlen(s);
-		p = savepvn(s, len);
+		const char * const p = savepvn(s, len);
 		incpush(p, TRUE, TRUE, FALSE, FALSE);
 		sv_catpvn(sv, "-I", 2);
 		sv_catpvn(sv, p, len);
@@ -1730,38 +1729,80 @@ S_parse_body(pTHX_ char **env, XSINIT_t xsinit)
 #  ifdef DEBUGGING
 		    sv_catpv(opts_prog," DEBUGGING");
 #  endif
+#  ifdef DEBUG_LEAKING_SCALARS_FORK_DUMP
+		    sv_catpv(opts_prog," DEBUG_LEAKING_SCALARS_FORK_DUMP");
+#  endif
+#  ifdef FAKE_THREADS
+		    sv_catpv(opts_prog," FAKE_THREADS");
+#  endif
 #  ifdef MULTIPLICITY
 		    sv_catpv(opts_prog," MULTIPLICITY");
 #  endif
+#  ifdef MYMALLOC
+		    sv_catpv(opts_prog," MYMALLOC");
+#  endif
+#  ifdef PERL_DONT_CREATE_GVSV
+		    sv_catpv(opts_prog," PERL_DONT_CREATE_GVSV");
+#  endif
+#  ifdef PERL_GLOBAL_STRUCT
+		    sv_catpv(opts_prog," PERL_GLOBAL_STRUCT");
+#  endif
+#  ifdef PERL_IMPLICIT_CONTEXT
+		    sv_catpv(opts_prog," PERL_IMPLICIT_CONTEXT");
+#  endif
+#  ifdef PERL_IMPLICIT_SYS
+		    sv_catpv(opts_prog," PERL_IMPLICIT_SYS");
+#  endif
+#  ifdef PERL_MALLOC_WRAP
+		    sv_catpv(opts_prog," PERL_MALLOC_WRAP");
+#  endif
+#  ifdef PERL_NEED_APPCTX
+		    sv_catpv(opts_prog," PERL_NEED_APPCTX");
+#  endif
+#  ifdef PERL_NEED_TIMESBASE
+		    sv_catpv(opts_prog," PERL_NEED_TIMESBASE");
+#  endif
+#  ifdef PERL_OLD_COPY_ON_WRITE
+		    sv_catpv(opts_prog," PERL_OLD_COPY_ON_WRITE");
+#  endif
+#  ifdef PL_OP_SLAB_ALLOC
+		    sv_catpv(opts_prog," PL_OP_SLAB_ALLOC");
+#  endif
+#  ifdef THREADS_HAVE_PIDS
+		    sv_catpv(opts_prog," THREADS_HAVE_PIDS");
+#  endif
 #  ifdef USE_5005THREADS
 		    sv_catpv(opts_prog," USE_5005THREADS");
 #  endif
-#  ifdef USE_ITHREADS
-		    sv_catpv(opts_prog," USE_ITHREADS");
+#  ifdef USE_64_BIT_ALL
+		    sv_catpv(opts_prog," USE_64_BIT_ALL");
 #  endif
 #  ifdef USE_64_BIT_INT
 		    sv_catpv(opts_prog," USE_64_BIT_INT");
 #  endif
-#  ifdef USE_64_BIT_ALL
-		    sv_catpv(opts_prog," USE_64_BIT_ALL");
+#  ifdef USE_ITHREADS
+		    sv_catpv(opts_prog," USE_ITHREADS");
+#  endif
+#  ifdef USE_LARGE_FILES
+		    sv_catpv(opts_prog," USE_LARGE_FILES");
 #  endif
 #  ifdef USE_LONG_DOUBLE
 		    sv_catpv(opts_prog," USE_LONG_DOUBLE");
 #  endif
-#  ifdef USE_LARGE_FILES
-		    sv_catpv(opts_prog," USE_LARGE_FILES");
+#  ifdef USE_PERLIO
+		    sv_catpv(opts_prog," USE_PERLIO");
 #  endif
-#  ifdef USE_SOCKS
-		    sv_catpv(opts_prog," USE_SOCKS");
+#  ifdef USE_REENTRANT_API
+		    sv_catpv(opts_prog," USE_REENTRANT_API");
+#  endif
+#  ifdef USE_SFIO
+		    sv_catpv(opts_prog," USE_SFIO");
 #  endif
 #  ifdef USE_SITECUSTOMIZE
 		    sv_catpv(opts_prog," USE_SITECUSTOMIZE");
 #  endif	       
-#  ifdef PERL_IMPLICIT_CONTEXT
-		    sv_catpv(opts_prog," PERL_IMPLICIT_CONTEXT");
-#  endif
-#  ifdef PERL_IMPLICIT_SYS
-		    sv_catpv(opts_prog," PERL_IMPLICIT_SYS");
+#  ifdef USE_SOCKS
+		    sv_catpv(opts_prog," USE_SOCKS");
 #  endif
 
 		    while (SvCUR(opts_prog) > opts+76) {
@@ -1960,7 +2001,7 @@ S_parse_body(pTHX_ char **env, XSINIT_t xsinit)
 #  define SIGCHLD SIGCLD
 #endif
 	Sighandler_t sigstate = rsignal_state(SIGCHLD);
-	if (sigstate == SIG_IGN) {
+	if (sigstate == (Sighandler_t) SIG_IGN) {
 	    if (ckWARN(WARN_SIGNAL))
 		Perl_warner(aTHX_ packWARN(WARN_SIGNAL),
 			    "Can't ignore signal CHLD, forcing to default");
@@ -2197,8 +2238,10 @@ S_run_body(pTHX_ I32 oldscope)
 
     if (!PL_restartop) {
 	DEBUG_x(dump_all());
+#ifdef DEBUGGING
 	if (!DEBUG_q_TEST)
 	  PERL_DEBUG(PerlIO_printf(Perl_debug_log, "\nEXECUTING...\n\n"));
+#endif
 	DEBUG_S(PerlIO_printf(Perl_debug_log, "main thread is 0x%"UVxf"\n",
 			      PTR2UV(thr)));
 
@@ -4410,10 +4453,10 @@ S_init_predump_symbols(pTHX)
 void
 Perl_init_argv_symbols(pTHX_ register int argc, register char **argv)
 {
-    char *s;
     argc--,argv++;	/* skip name of script */
     if (PL_doswitches) {
 	for (; argc > 0 && **argv == '-'; argc--,argv++) {
+	    char *s;
 	    if (!argv[0][1])
 		break;
 	    if (argv[0][1] == '-' && !argv[0][2]) {
@@ -4433,7 +4476,7 @@ Perl_init_argv_symbols(pTHX_ register int argc, register char **argv)
 	(void)gv_AVadd(PL_argvgv);
 	av_clear(GvAVn(PL_argvgv));
 	for (; argc > 0; argc--,argv++) {
-	    SV *sv = newSVpv(argv[0],0);
+	    SV * const sv = newSVpv(argv[0],0);
 	    av_push(GvAVn(PL_argvgv),sv);
 	    if (!(PL_unicode & PERL_UNICODE_LOCALE_FLAG) || PL_utf8locale) {
 		 if (PL_unicode & PERL_UNICODE_ARGV_FLAG)