X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=util.c;h=fd5e04150e9972cbdd1e2f77d7ccd8b2f16fea43;hb=45977657b0fa2c29b268b817f40e6b295a501d39;hp=afbe19e6449c975f76240e413f32602ec97b4f65;hpb=73d840c0daa603a18a29260159881d4ef6772d73;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/util.c b/util.c
index afbe19e..fd5e041 100644
--- a/util.c
+++ b/util.c
@@ -796,10 +796,10 @@ Perl_savepvn(pTHX_ const char *pv, register I32 len)
     if (pv) {
 	/* might not be null terminated */
     	newaddr[len] = '\0';
-    	return CopyD(pv,newaddr,len,char);
+    	return (char *) CopyD(pv,newaddr,len,char);
     }
     else {
-	return ZeroD(newaddr,len+1,char);
+	return (char *) ZeroD(newaddr,len+1,char);
     }
 }
 
@@ -845,7 +845,7 @@ Perl_savesvpv(pTHX_ SV *sv)
 
     ++len;
     New(903,newaddr,len,char);
-    return CopyD(pv,newaddr,len,char);
+    return (char *) CopyD(pv,newaddr,len,char);
 }
 
 
@@ -1068,7 +1068,7 @@ Perl_write_to_stderr(pTHX_ const char* message, int msglen)
 
 void S_vdie_common(pTHX_ const char *message, STRLEN msglen, I32 utf8);
 
-char *
+STATIC char *
 S_vdie_croak_common(pTHX_ const char* pat, va_list* args, STRLEN* msglen,
 		    I32* utf8)
 {
@@ -1465,7 +1465,7 @@ Perl_my_setenv(pTHX_ const char *nam, const char *val)
 #else /* WIN32 || NETWARE */
 
 void
-Perl_my_setenv(pTHX_ const char *nam, char *val)
+Perl_my_setenv(pTHX_ const char *nam, const char *val)
 {
     register char *envstr;
     const int nlen = strlen(nam);
@@ -2026,7 +2026,7 @@ Perl_my_popen_list(pTHX_ char *mode, int n, SV **args)
     sv = *av_fetch(PL_fdpid,p[This],TRUE);
     UNLOCK_FDPID_MUTEX;
     (void)SvUPGRADE(sv,SVt_IV);
-    SvIVX(sv) = pid;
+    SvIV_set(sv, pid);
     PL_forkprocess = pid;
     /* If we managed to get status pipe check for exec fail */
     if (did_pipes && pid > 0) {
@@ -2179,7 +2179,7 @@ Perl_my_popen(pTHX_ char *cmd, char *mode)
     sv = *av_fetch(PL_fdpid,p[This],TRUE);
     UNLOCK_FDPID_MUTEX;
     (void)SvUPGRADE(sv,SVt_IV);
-    SvIVX(sv) = pid;
+    SvIV_set(sv, pid);
     PL_forkprocess = pid;
     if (did_pipes && pid > 0) {
 	int errkid;
@@ -2636,7 +2636,7 @@ Perl_pidgone(pTHX_ Pid_t pid, int status)
     sprintf(spid, "%"IVdf, (IV)pid);
     sv = *hv_fetch(PL_pidstatus,spid,strlen(spid),TRUE);
     (void)SvUPGRADE(sv,SVt_IV);
-    SvIVX(sv) = status;
+    SvIV_set(sv, status);
     return;
 }
 
@@ -2816,7 +2816,7 @@ Perl_find_script(pTHX_ const char *scriptname, bool dosearch, const char **searc
     if (strEQ(scriptname, "-"))
  	dosearch = 0;
     if (dosearch) {		/* Look in '.' first. */
-	char *cur = scriptname;
+	const char *cur = scriptname;
 #ifdef SEARCH_EXTS
 	if ((curext = strrchr(scriptname,'.')))	/* possible current ext */
 	    while (ext[i])
@@ -3008,13 +3008,13 @@ Perl_GetVars(pTHX)
 }
 #endif
 
-const char **
+char **
 Perl_get_op_names(pTHX)
 {
  return PL_op_name;
 }
 
-const char **
+char **
 Perl_get_op_descs(pTHX)
 {
  return PL_op_desc;