integrate mainline changes

p4raw-id: //depot/utfperl@4679

1 files changed, 10 insertions, 9 deletions

diff --git a/sv.h b/sv.h
index 20253be83e..cefe13ced1 100644
--- a/sv.h
+++ b/sv.h
@@ -260,7 +260,7 @@ struct xpvbm {
     U8		xbm_rare;	/* rarest character in string */
 };
 
-/* This structure much match XPVCV */
+/* This structure much match XPVCV in cv.h */
 
 typedef U16 cv_flags_t;
 
@@ -279,8 +279,8 @@ struct xpvfm {
     void      (*xcv_xsub)(pTHXo_ CV*);
     ANY		xcv_xsubany;
     GV *	xcv_gv;
-    GV *	xcv_filegv;
-    long	xcv_depth;		/* >= 2 indicates recursive call */
+    char *	xcv_file;
+    long	xcv_depth;	/* >= 2 indicates recursive call */
     AV *	xcv_padlist;
     CV *	xcv_outside;
 #ifdef USE_THREADS
@@ -319,12 +319,13 @@ struct xpvio {
     char	xio_flags;
 };
 
-#define IOf_ARGV 1	/* this fp iterates over ARGV */
-#define IOf_START 2	/* check for null ARGV and substitute '-' */
-#define IOf_FLUSH 4	/* this fp wants a flush after write op */
-#define IOf_DIDTOP 8	/* just did top of form */
-#define IOf_UNTAINT 16  /* consider this fp (and its data) "safe" */
-#define IOf_NOLINE  32	/* slurped a pseudo-line from empty file */
+#define IOf_ARGV	1	/* this fp iterates over ARGV */
+#define IOf_START	2	/* check for null ARGV and substitute '-' */
+#define IOf_FLUSH	4	/* this fp wants a flush after write op */
+#define IOf_DIDTOP	8	/* just did top of form */
+#define IOf_UNTAINT	16	/* consider this fp (and its data) "safe" */
+#define IOf_NOLINE	32	/* slurped a pseudo-line from empty file */
+#define IOf_FAKE_DIRP	64	/* xio_dirp is fake (source filters kludge) */
 
 /* The following macros define implementation-independent predicates on SVs. */