Double magic with substr

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

diff --git a/regexp.h b/regexp.h
index 07fe0b7..156e60b 100644 (file)
--- a/regexp.h
+++ b/regexp.h
@@ -97,9 +97,9 @@ typedef struct regexp_paren_pair {
        I32 sublen;     /* Length of string pointed by subbeg */        \
        /* Information about the match that isn't often used */         \
        /* offset from wrapped to the start of precomp */               \
-       unsigned pre_prefix:4;                                          \
+       PERL_BITFIELD32 pre_prefix:4;                                   \
        /* number of eval groups in the pattern - for security checks */\
-       unsigned seen_evals:28
+       PERL_BITFIELD32 seen_evals:28
 
 typedef struct regexp {
        _XPV_HEAD;
@@ -379,7 +379,7 @@ and check for NULL.
 #define RX_WRAPLEN(prog)       SvCUR(prog)
 #define RX_CHECK_SUBSTR(prog)  (((struct regexp *)SvANY(prog))->check_substr)
 #define RX_REFCNT(prog)                SvREFCNT(prog)
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__) && !defined(PERL_GCC_PEDANTIC)
+#if defined(__GNUC__) && !defined(PERL_GCC_BRACE_GROUPS_FORBIDDEN)
 #  define RX_EXTFLAGS(prog)                                            \
     (*({                                                               \
        const REGEXP *const thwape = (prog);                            \
@@ -464,7 +464,7 @@ and check for NULL.
 #define REXEC_IGNOREPOS        0x08            /* \G matches at start. */
 #define REXEC_NOT_FIRST        0x10            /* This is another iteration of //g. */
 
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__) && !defined(PERL_GCC_PEDANTIC)
+#if defined(__GNUC__) && !defined(PERL_GCC_BRACE_GROUPS_FORBIDDEN)
 #  define ReREFCNT_inc(re)                                             \
     ({                                                                 \
        /* This is here to generate a casting warning if incorrect.  */ \