1 files changed, 4 insertions, 6 deletions
diff --git a/re.h b/re.h
index 1db1ec34cc..babbe413e5 100644
--- a/re.h
+++ b/re.h
@@ -21,16 +21,14 @@
 
 typedef struct re_pattern_buffer Regexp;
 
-struct match {
+struct RMatch {
+    struct RBasic basic;
     UINT len;
     char *ptr;
-    struct re_registers regs;
+    struct re_registers *regs;
 };
 
-extern struct match last_match;
-
-#define BEG(no) last_match.regs.beg[no]
-#define END(no) last_match.regs.end[no]
+#define RMATCH(obj)  (R_CAST(RMatch)(obj))
 
 VALUE re_regcomp();
 VALUE re_regsub();