Use HAVE_REGEX_T_RE_MAGIC to fix compilation problem on systems where

re_magic is not provided publicly.

diff --git a/ext/ereg/ereg.c b/ext/ereg/ereg.c
index ed073245999fa17f35375f1d04597ad6caf1ea44..0d5273a96a5a1c803df0387b84c7ca39f6878042 100644 (file)
--- a/ext/ereg/ereg.c
+++ b/ext/ereg/ereg.c
@@ -46,6 +46,7 @@ static int _php_regcomp(regex_t *preg, const char *pattern, int cflags)
        
        if(zend_hash_find(&REG(ht_rc), (char *) pattern, patlen+1, (void **) &rc) == SUCCESS
           && rc->cflags == cflags) {
+#ifdef HAVE_REGEX_T_RE_MAGIC
                /*
                 * We use a saved magic number to see whether cache is corrupted, and if it
                 * is, we flush it and compile the pattern from scratch.
@@ -73,7 +74,20 @@ static int _php_regcomp(regex_t *preg, const char *pattern, int cflags)
                zend_hash_update(&REG(ht_rc), (char *) pattern, patlen+1,
                                                 (void *) &rcp, sizeof(rcp), NULL);
        }
-       
+#else
+               memcpy(preg, &rc->preg, sizeof(*preg));
+       } else {
+               r = regcomp(preg, pattern, cflags);
+               if(!r) {
+                       reg_cache rcp;
+
+                       rcp.cflags = cflags;
+                       memcpy(&rcp.preg, preg, sizeof(*preg));
+                       zend_hash_update(&REG(ht_rc), (char *) pattern, patlen+1,
+                                                        (void *) &rcp, sizeof(rcp), NULL);
+               }
+       }
+#endif
        return r;
 }
 /* }}} */

diff --git a/ext/standard/reg.c b/ext/standard/reg.c
index ed073245999fa17f35375f1d04597ad6caf1ea44..0d5273a96a5a1c803df0387b84c7ca39f6878042 100644 (file)
--- a/ext/standard/reg.c
+++ b/ext/standard/reg.c
@@ -46,6 +46,7 @@ static int _php_regcomp(regex_t *preg, const char *pattern, int cflags)
        
        if(zend_hash_find(&REG(ht_rc), (char *) pattern, patlen+1, (void **) &rc) == SUCCESS
           && rc->cflags == cflags) {
+#ifdef HAVE_REGEX_T_RE_MAGIC
                /*
                 * We use a saved magic number to see whether cache is corrupted, and if it
                 * is, we flush it and compile the pattern from scratch.
@@ -73,7 +74,20 @@ static int _php_regcomp(regex_t *preg, const char *pattern, int cflags)
                zend_hash_update(&REG(ht_rc), (char *) pattern, patlen+1,
                                                 (void *) &rcp, sizeof(rcp), NULL);
        }
-       
+#else
+               memcpy(preg, &rc->preg, sizeof(*preg));
+       } else {
+               r = regcomp(preg, pattern, cflags);
+               if(!r) {
+                       reg_cache rcp;
+
+                       rcp.cflags = cflags;
+                       memcpy(&rcp.preg, preg, sizeof(*preg));
+                       zend_hash_update(&REG(ht_rc), (char *) pattern, patlen+1,
+                                                        (void *) &rcp, sizeof(rcp), NULL);
+               }
+       }
+#endif
        return r;
 }
 /* }}} */