[perl #24942] fields::inherit doesn't bless derived

[perl5.git] / miniperlmain.c

diff --git a/miniperlmain.c b/miniperlmain.c
index 34faed6..4e9e5e8 100644 (file)
--- a/miniperlmain.c
+++ b/miniperlmain.c
@@ -1,3 +1,13 @@
+/*    miniperlmain.c
+ *
+ *    Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002,
+ *    by Larry Wall and others
+ *
+ *    You may distribute under the terms of either the GNU General Public
+ *    License or the Artistic License, as specified in the README file.
+ *
+ */
+
 /*
  * "The Road goes ever on and on, down from the door where it began."
  */
@@ -25,18 +35,8 @@ static PerlInterpreter *my_perl;
 long _stksize = 64 * 1024;
 #endif
 
-/* If the compiler is in such a strict mood that it doesn't
- * even like the third argument of main(). */
-#if (defined(__DECC) && defined(__STDC__) && __STDC__ == 1)
-#   define STRICT_ANSI_DISLIKES_ENVP
-#endif
-
 int
-main(int argc, char **argv
-#ifndef STRICT_ANSI_DISLIKES_ENVP
-     , char **envp
-#endif
-     )
+main(int argc, char **argv, char **env)
 {
     int exitstatus;
 
@@ -56,10 +56,9 @@ main(int argc, char **argv
     /* noop unless Configure is given -Accflags=-DPERL_GPROF_CONTROL */
     PERL_GPROF_MONCONTROL(0);
 
-    /* The default PERL_SYS_INIT3 ignores envp but e.g. OS/2 uses it. */
-    PERL_SYS_INIT3(&argc,&argv,&envp);
+    PERL_SYS_INIT3(&argc,&argv,&env);
 
-#if defined(USE_5005THREADS) || defined(USE_ITHREADS)
+#if defined(USE_ITHREADS)
     /* XXX Ideally, this should really be happening in perl_alloc() or
      * perl_construct() to keep libperl.a transparently fork()-safe.
      * It is currently done here only because Apache/mod_perl have