Change 33332: [PATCH] consting for .c files in tests

[Rafael Garcia-Suarez]

Change 33332 by [EMAIL PROTECTED] on 2008/02/18 15:05:27

        Subject: [PATCH] consting for .c files in tests
        From: "Robin Barker" <[EMAIL PROTECTED]>
        Date: Mon, 18 Feb 2008 13:43:56 -0000
        Message-ID: <[EMAIL PROTECTED]>

Affected files ...

... //depot/perl/lib/ExtUtils/t/Embed.t#22 edit
... //depot/perl/lib/Module/Build/t/lib/DistGen.pm#4 edit

Differences ...

==== //depot/perl/lib/ExtUtils/t/Embed.t#22 (text) ====
Index: perl/lib/ExtUtils/t/Embed.t
--- perl/lib/ExtUtils/t/Embed.t#21~30840~       2007-04-03 23:46:46.000000000 
-0700
+++ perl/lib/ExtUtils/t/Embed.t 2008-02-18 07:05:27.000000000 -0800
@@ -163,7 +163,7 @@
 
 #define my_puts(a) if(puts(a) < 0) exit(666)
 
-static char *cmds[] = { "perl","-e", "$|=1; print qq[ok 5\\n]", NULL };
+static const char * cmds [] = { "perl", "-e", "$|=1; print qq[ok 5\\n]", NULL 
};
 
 #ifdef PERL_GLOBAL_STRUCT_PRIVATE
 static struct perl_vars *my_plvarsp;
@@ -171,12 +171,11 @@
 #endif
 
 #ifdef NO_ENV_ARRAY_IN_MAIN
-extern char **environ;
-int main(int argc, char **argv)
+int main(int argc, char **argv) {
+    char **env;
 #else
-int main(int argc, char **argv, char **env)
+int main(int argc, char **argv, char **env) {
 #endif
-{
     PerlInterpreter *my_perl;
 #ifdef PERL_GLOBAL_STRUCT
     dVAR;
@@ -188,11 +187,7 @@
 
     (void)argc; /* PERL_SYS_INIT3 may #define away their use */
     (void)argv;
-#ifdef NO_ENV_ARRAY_IN_MAIN
-    PERL_SYS_INIT3(&argc,&argv,&environ);
-#else
-    PERL_SYS_INIT3(&argc,&argv,&env);
-#endif
+    PERL_SYS_INIT3(&argc, &argv, &env);
 
     my_perl = perl_alloc();
 
@@ -202,11 +197,7 @@
 
     my_puts("ok 3");
 
-#ifdef NO_ENV_ARRAY_IN_MAIN
-    perl_parse(my_perl, NULL, (sizeof(cmds)/sizeof(char *))-1, cmds, environ);
-#else
-    perl_parse(my_perl, NULL, (sizeof(cmds)/sizeof(char *))-1, cmds, env);
-#endif
+    perl_parse(my_perl, NULL, (sizeof(cmds)/sizeof(char *))-1, (char **)cmds, 
env);
 
     my_puts("ok 4");
 

==== //depot/perl/lib/Module/Build/t/lib/DistGen.pm#4 (text) ====
Index: perl/lib/Module/Build/t/lib/DistGen.pm
--- perl/lib/Module/Build/t/lib/DistGen.pm#3~32192~     2007-10-25 
02:46:55.000000000 -0700
+++ perl/lib/Module/Build/t/lib/DistGen.pm      2008-02-18 07:05:27.000000000 
-0800
@@ -180,14 +180,14 @@
           OUTPUT:
               RETVAL
 
-      char *
+      const char *
       xs_version()
           CODE:
         RETVAL = XS_VERSION;
           OUTPUT:
         RETVAL
 
-      char *
+      const char *
       version()
           CODE:
         RETVAL = VERSION;
End of Patch.