[inseparable changes from match from perl-5.003_90 to perl-5.003_91]

[p5sagit/p5-mst-13.2.git] / mg.h

diff --git a/mg.h b/mg.h
index b2cd7d6..416eceb 100644 (file)
--- a/mg.h
+++ b/mg.h
@@ -1,19 +1,18 @@
-/* $RCSfile: arg.h,v $$Revision: 4.1 $$Date: 92/08/07 17:18:16 $
+/*    mg.h
  *
- *    Copyright (c) 1993, Larry Wall
+ *    Copyright (c) 1991-1994, Larry Wall
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
  *
- * $Log:       arg.h,v $
  */
 
 struct mgvtbl {
-    int                (*svt_get)      P((SV *sv, MAGIC* mg));
-    int                (*svt_set)      P((SV *sv, MAGIC* mg));
-    U32                (*svt_len)      P((SV *sv, MAGIC* mg));
-    int                (*svt_clear)    P((SV *sv, MAGIC* mg));
-    int                (*svt_free)     P((SV *sv, MAGIC* mg));
+    int                (*svt_get)      _((SV *sv, MAGIC* mg));
+    int                (*svt_set)      _((SV *sv, MAGIC* mg));
+    U32                (*svt_len)      _((SV *sv, MAGIC* mg));
+    int                (*svt_clear)    _((SV *sv, MAGIC* mg));
+    int                (*svt_free)     _((SV *sv, MAGIC* mg));
 };
 
 struct magic {
@@ -29,5 +28,14 @@ struct magic {
 
 #define MGf_TAINTEDDIR 1
 #define MGf_REFCOUNTED 2
-#define MgTAINTEDDIR(mg) (mg->mg_flags & MGf_TAINTEDDIR)
-#define MgTAINTEDDIR_on(mg) (mg->mg_flags |= MGf_TAINTEDDIR)
+#define MGf_GSKIP      4
+
+#define MGf_MINMATCH   1
+
+#define MgTAINTEDDIR(mg)       (mg->mg_flags & MGf_TAINTEDDIR)
+#define MgTAINTEDDIR_on(mg)    (mg->mg_flags |= MGf_TAINTEDDIR)
+#define MgTAINTEDDIR_off(mg)   (mg->mg_flags &= ~MGf_TAINTEDDIR)
+
+#define MgPV(mg)                ((mg)->mg_len == HEf_SVKEY) ?   \
+                                SvPV((SV*)((mg)->mg_ptr),na) :   \
+                                (mg)->mg_ptr