X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=gv.h;h=d9a5b510372dc3892b2062835fc184c5721384bc;hb=c48640ec958027811b711ad07ca27c7f6b7ebbe0;hp=dfc74ca18bc3cac9d2824ca000e18abf03e0df6f;hpb=4a53c07f7634485327374023491d928f581d1df0;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/gv.h b/gv.h
index dfc74ca..d9a5b51 100644
--- a/gv.h
+++ b/gv.h
@@ -1,7 +1,7 @@
 /*    gv.h
  *
  *    Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- *    2000, 2001, 2002, by Larry Wall and others
+ *    2000, 2001, 2002, 2003, 2004, 2005, 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.
@@ -18,7 +18,6 @@ struct gp {
     GV *	gp_egv;		/* effective gv, if *glob */
     CV *	gp_cv;		/* subroutine value */
     U32		gp_cvgen;	/* generational validity of cached gv_cv */
-    U32		gp_flags;	/* XXX unused */
     line_t	gp_line;	/* line first declared at (for -w) */
     char *	gp_file;	/* file first declared in (for -w) */
 };
@@ -42,6 +41,14 @@ Return the SV from the GV.
 */
 
 #define GvSV(gv)	(GvGP(gv)->gp_sv)
+#ifdef PERL_DONT_CREATE_GVSV
+#define GvSVn(gv)	(*(GvGP(gv)->gp_sv ? \
+			 &(GvGP(gv)->gp_sv) : \
+			 &(GvGP(gv_SVadd(gv))->gp_sv)))
+#else
+#define GvSVn(gv)	GvSV(gv)
+#endif
+
 #define GvREFCNT(gv)	(GvGP(gv)->gp_refcnt)
 #define GvIO(gv)	((gv) && SvTYPE((SV*)gv) == SVt_PVGV && GvGP(gv) ? GvIOp(gv) : 0)
 #define GvIOp(gv)	(GvGP(gv)->gp_io)
@@ -66,8 +73,6 @@ Return the SV from the GV.
 #define GvCVGEN(gv)	(GvGP(gv)->gp_cvgen)
 #define GvCVu(gv)	(GvGP(gv)->gp_cvgen ? Nullcv : GvGP(gv)->gp_cv)
 
-#define GvGPFLAGS(gv)	(GvGP(gv)->gp_flags)
-
 #define GvLINE(gv)	(GvGP(gv)->gp_line)
 #define GvFILE(gv)	(GvGP(gv)->gp_file)
 #define GvFILEGV(gv)	(gv_fetchfile(GvFILE(gv)))
@@ -122,12 +127,9 @@ Return the SV from the GV.
 #define GvIN_PAD_on(gv)		(GvFLAGS(gv) |= GVf_IN_PAD)
 #define GvIN_PAD_off(gv)	(GvFLAGS(gv) &= ~GVf_IN_PAD)
 
-/* XXX: all GvFLAGS options are used, borrowing GvGPFLAGS for the moment */
-
-#define GVf_UNIQUE           0x0001
-#define GvUNIQUE(gv)         (GvGP(gv) && (GvGPFLAGS(gv) & GVf_UNIQUE))
-#define GvUNIQUE_on(gv)      (GvGPFLAGS(gv) |= GVf_UNIQUE)
-#define GvUNIQUE_off(gv)     (GvGPFLAGS(gv) &= ~GVf_UNIQUE)
+#define GvUNIQUE(gv)            0
+#define GvUNIQUE_on(gv)
+#define GvUNIQUE_off(gv)
 
 #ifdef USE_ITHREADS
 #define GV_UNIQUE_CHECK
@@ -153,6 +155,9 @@ Return the SV from the GV.
 #define GV_ADDWARN	0x04	/* add, but warn if symbol wasn't already there */
 #define GV_ADDINEVAL	0x08	/* add, as though we're doing so within an eval */
 #define GV_NOINIT	0x10	/* add, but don't init symbol, if type != PVGV */
-
-#define gv_fullname3(sv,gv,prefix) gv_fullname4(sv,gv,prefix,TRUE);
-#define gv_efullname3(sv,gv,prefix) gv_efullname4(sv,gv,prefix,TRUE);
+/*      SVf_UTF8 (more accurately the return value from SvUTF8) is also valid
+	as a flag to gv_fetch_pvn_flags, so ensure it lies outside this range.
+*/
+#define gv_fullname3(sv,gv,prefix) gv_fullname4(sv,gv,prefix,TRUE)
+#define gv_efullname3(sv,gv,prefix) gv_efullname4(sv,gv,prefix,TRUE)
+#define gv_fetchmethod(stash, name) gv_fetchmethod_autoload(stash, name, TRUE)