Down with C++ reserved names

[p5sagit/p5-mst-13.2.git] / util.c

diff --git a/util.c b/util.c
index ca78177..010507d 100644 (file)
--- a/util.c
+++ b/util.c
@@ -246,7 +246,7 @@ Perl_delimcpy(pTHX_ register char *to, register const char *toend, register cons
     if (to < toend)
        *to = '\0';
     *retlen = tolen;
-    return from;
+    return (char *)from;
 }
 
 /* return ptr to little string in big string, NULL if not found */
@@ -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)
 {
@@ -1142,7 +1142,7 @@ S_vdie_common(pTHX_ const char *message, STRLEN msglen, I32 utf8)
 OP *
 Perl_vdie(pTHX_ const char* pat, va_list *args)
 {
-    char *message;
+    const char *message;
     const int was_in_eval = PL_in_eval;
     STRLEN msglen;
     I32 utf8 = 0;
@@ -1191,7 +1191,7 @@ Perl_die(pTHX_ const char* pat, ...)
 void
 Perl_vcroak(pTHX_ const char* pat, va_list *args)
 {
-    char *message;
+    const char *message;
     STRLEN msglen;
     I32 utf8 = 0;
 
@@ -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);
@@ -2758,6 +2758,7 @@ Perl_find_script(pTHX_ const char *scriptname, bool dosearch, const char **searc
     int extidx = 0, i = 0;
     const char *curext = Nullch;
 #else
+    (void)search_ext;
 #  define MAX_EXT_LEN 0
 #endif
 
@@ -2815,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])
@@ -3007,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;
@@ -3918,7 +3919,7 @@ Perl_scan_version(pTHX_ const char *s, SV *rv, bool qv)
        while (len-- > 0)
            av_push((AV *)sv, newSViv(0));
     }
-    return s;
+    return (char *)s;
 }
 
 /*
@@ -4465,6 +4466,7 @@ some level of strict-ness.
 void
 Perl_sv_nosharing(pTHX_ SV *sv)
 {
+    (void)sv;
 }
 
 /*
@@ -4480,6 +4482,7 @@ some level of strict-ness.
 void
 Perl_sv_nolocking(pTHX_ SV *sv)
 {
+    (void)sv;
 }
 
 
@@ -4496,6 +4499,7 @@ some level of strict-ness.
 void
 Perl_sv_nounlocking(pTHX_ SV *sv)
 {
+    (void)sv;
 }
 
 U32