add B::PV::{LEN,CUR}

[p5sagit/p5-mst-13.2.git] / ext / B / byteperl.c

diff --git a/ext/B/byteperl.c b/ext/B/byteperl.c
index a42edfb..17dfdee 100644 (file)
--- a/ext/B/byteperl.c
+++ b/ext/B/byteperl.c
@@ -1,10 +1,7 @@
 #include "EXTERN.h"
 #include "perl.h"
-#ifndef PATCHLEVEL
-#include "patchlevel.h"
-#endif
 
-static void xs_init _((void));
+static void xs_init (void);
 static PerlInterpreter *my_perl;
 
 int
@@ -28,22 +25,22 @@ main(int argc, char **argv, char **env)
     INIT_SPECIALSV_LIST;
     PERL_SYS_INIT(&argc,&argv);
  
-#if PATCHLEVEL > 3 || (PATCHLEVEL == 3 && SUBVERSION >= 1)
     perl_init_i18nl10n(1);
-#else
-    perl_init_i18nl14n(1);
-#endif
 
-    if (!do_undump) {
+    if (!PL_do_undump) {
        my_perl = perl_alloc();
        if (!my_perl)
+#ifdef VMS
+           exit(vaxc$errno);
+#else
            exit(1);
+#endif
        perl_construct( my_perl );
     }
 
 #ifdef CSH
-    if (!cshlen) 
-      cshlen = strlen(cshname);
+    if (!PL_cshlen) 
+      PL_cshlen = strlen(PL_cshname);
 #endif
 
     if (argc < 2)
@@ -56,7 +53,11 @@ main(int argc, char **argv, char **env)
 #endif
        if (!fp) {
            perror(argv[1]);
+#ifdef VMS
+           exit(vaxc$errno);
+#else
            exit(1);
+#endif
        }
        argv++;
        argc--;
@@ -75,13 +76,13 @@ main(int argc, char **argv, char **env)
        exit( exitstatus );
 
     sv_setpv(GvSV(gv_fetchpv("0", TRUE, SVt_PV)), argv[0]);
-    main_cv = compcv;
-    compcv = 0;
+    PL_main_cv = PL_compcv;
+    PL_compcv = 0;
 
 #ifdef INDIRECT_BGET_MACROS
     bs.data = fp;
-    bs.fgetc = (int(*) _((void*)))fgetc;
-    bs.fread = (int(*) _((char*,size_t,size_t,void*)))fread;
+    bs.fgetc = (int(*) (void*))fgetc;
+    bs.fread = (int(*) (char*,size_t,size_t,void*))fread;
     bs.freadpv = freadpv;
     byterun(bs);
 #else