hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PCRE2_CODE_UNIT_WIDTH must not be defined.

Browse Source
This commit is contained in:
Johan Wikman
2016-10-27 15:25:00 +03:00
parent 1728e2dc2e
commit bbade8b736
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/maxscale/pcre2.h
View File

@ -27,14 +27,16 @@
#include <maxscale/cdefs.h> #include <maxscale/cdefs.h>
#ifndef PCRE2_CODE_UNIT_WIDTH MXS_BEGIN_DECLS
#if defined(PCRE2_CODE_UNIT_WIDTH)
#error PCRE2_CODE_UNIT_WIDTH already defined. Do not define, and include <maxscale/pcre2.h>.
#else
#define PCRE2_CODE_UNIT_WIDTH 8 #define PCRE2_CODE_UNIT_WIDTH 8
#endif #endif
#include <pcre2.h> #include <pcre2.h>
MXS_BEGIN_DECLS
typedef enum typedef enum
{ {
MXS_PCRE2_MATCH, MXS_PCRE2_MATCH,

14
server/modules/filter/regexfilter/regexfilter.c
View File

@ -11,17 +11,17 @@
* Public License. * Public License.
*/ */
#define PCRE2_CODE_UNIT_WIDTH 8 #include <maxscale/cdefs.h>
#include <string.h>
#include <stdio.h> #include <stdio.h>
#include <maxscale/alloc.h>
#include <maxscale/atomic.h>
#include <maxscale/config.h>
#include <maxscale/filter.h> #include <maxscale/filter.h>
#include <maxscale/log_manager.h>
#include <maxscale/modinfo.h> #include <maxscale/modinfo.h>
#include <maxscale/modutil.h> #include <maxscale/modutil.h>
#include <maxscale/log_manager.h> #include <maxscale/pcre2.h>
#include <string.h>
#include <pcre2.h>
#include <maxscale/atomic.h>
#include <maxscale/alloc.h>
#include <maxscale/config.h>
/** /**
* @file regexfilter.c - a very simple regular expression rewrite filter. * @file regexfilter.c - a very simple regular expression rewrite filter.