[master] fd2cdbb Remove the magic variable used to inform varnishtests now defunct "feature pcre_jit".
Poul-Henning Kamp
phk at FreeBSD.org
Fri May 22 22:09:20 CEST 2015
commit fd2cdbb2846b185ac27a9712d30c3d68666f9cc8
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Fri May 22 20:08:29 2015 +0000
Remove the magic variable used to inform varnishtests now defunct
"feature pcre_jit".
diff --git a/include/vre.h b/include/vre.h
index 301e806..a59e8d7 100644
--- a/include/vre.h
+++ b/include/vre.h
@@ -51,8 +51,6 @@ typedef struct vre vre_t;
extern const unsigned VRE_CASELESS;
extern const unsigned VRE_NOTEMPTY;
-extern const int vre__jit;
-
vre_t *VRE_compile(const char *, int, const char **, int *);
int VRE_exec(const vre_t *code, const char *subject, int length,
int startoffset, int options, int *ovector, int ovecsize,
diff --git a/lib/libvarnish/vre.c b/lib/libvarnish/vre.c
index bbebef0..94400fa 100644
--- a/lib/libvarnish/vre.c
+++ b/lib/libvarnish/vre.c
@@ -46,8 +46,6 @@
# define pcre_free_study pcre_free
#endif
-const int vre__jit = VRE_STUDY_JIT_COMPILE;
-
struct vre {
unsigned magic;
#define VRE_MAGIC 0xe83097dc
@@ -81,7 +79,7 @@ VRE_compile(const char *pattern, int options,
VRE_free(&v);
return (NULL);
}
- v->re_extra = pcre_study(v->re, vre__jit, errptr);
+ v->re_extra = pcre_study(v->re, VRE_STUDY_JIT_COMPILE, errptr);
if (*errptr != NULL) {
VRE_free(&v);
return (NULL);
More information about the varnish-commit
mailing list