Cleanup remnants of 'KEY_err' removal

[perl5.git] / miniperlmain.c

diff --git a/miniperlmain.c b/miniperlmain.c
index a79099b..4edd4d1 100644 (file)
--- a/miniperlmain.c
+++ b/miniperlmain.c
@@ -33,7 +33,7 @@
  *
  * The content of the body of this generated file is mostly contained
  * in Miniperl.pm - edit that file if you want to change anything.
- * miniperlmain.c is generated by running regen/miniperlmain.pl.pl, while
+ * miniperlmain.c is generated by running regen/miniperlmain.pl, while
  * perlmain.c is built automatically by Makefile (so the former is
  * included in the tarball while the latter isn't).
  */
@@ -48,6 +48,11 @@
 #endif
 
 #define PERL_IN_MINIPERLMAIN_C
+
+/* work round bug in MakeMaker which doesn't currently (2019) supply this
+ * flag when making a statically linked perl */
+#define PERL_CORE 1
+
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
@@ -55,15 +60,6 @@
 static void xs_init (pTHX);
 static PerlInterpreter *my_perl;
 
-#if defined(PERL_GLOBAL_STRUCT_PRIVATE)
-/* The static struct perl_vars* may seem counterproductive since the
- * whole idea PERL_GLOBAL_STRUCT_PRIVATE was to avoid statics, but note
- * that this static is not in the shared perl library, the globals PL_Vars
- * and PL_VarsPtr will stay away. */
-static struct perl_vars* my_plvarsp;
-struct perl_vars* Perl_GetVarsPrivate(void) { return my_plvarsp; }
-#endif
-
 #ifdef NO_ENV_ARRAY_IN_MAIN
 extern char **environ;
 int
@@ -74,14 +70,6 @@ main(int argc, char **argv, char **env)
 #endif
 {
     int exitstatus, i;
-#ifdef PERL_GLOBAL_STRUCT
-    struct perl_vars *my_vars = init_global_struct();
-#  ifdef PERL_GLOBAL_STRUCT_PRIVATE
-    int veto;
-
-    my_plvarsp = my_vars;
-#  endif
-#endif /* PERL_GLOBAL_STRUCT */
 #ifndef NO_ENV_ARRAY_IN_MAIN
     PERL_UNUSED_ARG(env);
 #endif
@@ -124,8 +112,7 @@ main(int argc, char **argv, char **env)
        PL_perl_destruct_level = 0;
     }
     PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
-    exitstatus = perl_parse(my_perl, xs_init, argc, argv, (char **)NULL);
-    if (!exitstatus)
+    if (!perl_parse(my_perl, xs_init, argc, argv, (char **)NULL))
         perl_run(my_perl);
 
 #ifndef PERL_MICRO
@@ -156,20 +143,6 @@ main(int argc, char **argv, char **env)
 
     PERL_SYS_TERM();
 
-#ifdef PERL_GLOBAL_STRUCT
-#  ifdef PERL_GLOBAL_STRUCT_PRIVATE
-    veto = my_plvarsp->Gveto_cleanup;
-#  endif
-    free_global_struct(my_vars);
-#  ifdef PERL_GLOBAL_STRUCT_PRIVATE
-    if (!veto)
-        my_plvarsp = NULL;
-    /* Remember, functions registered with atexit() can run after this point,
-       and may access "global" variables, and hence end up calling
-       Perl_GetVarsPrivate()  */
-#endif
-#endif /* PERL_GLOBAL_STRUCT */
-
     exit(exitstatus);
 }