A couple of SCO compilation patches

[perl5.git] / intrpvar.h

diff --git a/intrpvar.h b/intrpvar.h
index 2e9d1af..a477777 100644 (file)
--- a/intrpvar.h
+++ b/intrpvar.h
@@ -235,7 +235,6 @@ PERLVAR(Iegid,              Gid_t)          /* current effective group id */
 PERLVAR(Inomemok,      bool)           /* let malloc context handle nomem */
 PERLVARI(Ian,          U32,    0)      /* malloc sequence number */
 PERLVARI(Icop_seqmax,  U32,    0)      /* statement sequence number */
-PERLVARI(Iop_seqmax,   U16,    0)      /* op sequence number */
 PERLVARI(Ievalseq,     U32,    0)      /* eval sequence number */
 PERLVAR(Iorigenviron,  char **)
 PERLVAR(Iorigalen,     U32)
@@ -397,14 +396,9 @@ PERLVARA(Ilast_swash_key,10,       U8)
 PERLVAR(Ilast_swash_tmps,      U8 *)
 PERLVAR(Ilast_swash_slen,      STRLEN)
 
-/* ex perly.c globals. Now just placeholders for BINCOMPAT in 5.8.x
- * XXX delete for 5.9.x */
-PERLVAR(IyydebugBINCOMPAT,     int)
-PERLVAR(IyynerrsBINCOMPAT,     int)
-PERLVAR(IyyerrflagBINCOMPAT,   int)
-PERLVAR(IyycharBINCOMPAT,      int)
-PERLVAR(IyyvalBINCOMPAT,       YYSTYPE)
-PERLVAR(IyylvalBINCOMPAT,      YYSTYPE)
+/* perly.c globals */
+PERLVAR(Iyycharp,      int *)
+PERLVAR(Iyylvalp,      YYSTYPE *)
 
 PERLVARI(Iglob_index,  int,    0)
 PERLVAR(Isrand_called, bool)
@@ -459,10 +453,10 @@ PERLVAR(Inumeric_radix_sv,        SV *)   /* The radix separator if not '.' */
 PERLVAR(Iregex_pad,     SV**)          /* All regex objects */
 PERLVAR(Iregex_padav,   AV*)           /* All regex objects */
 
-#ifdef USE_REENTRANT_API
-PERLVAR(Ireentrant_buffer, REENTR*)    /* here we store the _r buffers */
 #endif
 
+#ifdef USE_REENTRANT_API
+PERLVAR(Ireentrant_buffer, REENTR*)    /* here we store the _r buffers */
 #endif
 
 PERLVARI(Isavebegin,     bool, FALSE)  /* save BEGINs for compiler     */
@@ -536,6 +530,11 @@ PERLVARI(Irehash_seed, UV, 0)              /* 582 hash initializer */
 
 PERLVARI(Irehash_seed_set, bool, FALSE)        /* 582 hash initialized? */
 
+/* These two variables are needed to preserve 5.8.x bincompat because we can't
+   change function prototypes of two exported functions.  Probably should be
+   taken out of blead soon, and relevant prototypes changed.  */
+PERLVARI(Ifdscript, int, -1)   /* fd for script */
+PERLVARI(Isuidscript, int, -1) /* fd for suid script */
 /* New variables must be added to the very end, before this comment,
  * for binary compatibility (the offsets of the old members must not change).
  * (Don't forget to add your variable also to perl_clone()!)