diff options
| author | Nei <ailin.nemui@gmail.com> | 2017-01-02 17:03:31 +0000 |
|---|---|---|
| committer | ailin-nemui <ailin-nemui@users.noreply.github.com> | 2017-01-03 13:30:39 +0100 |
| commit | 7a112e021724af582a06eed8f92fafb772438c13 (patch) | |
| tree | 733934527ce98cb4c9ecdd7fb20001650fabcd53 /src/fe-common/core/hilight-text.h | |
| parent | 1b99299ed2af2ae459edbeb96f2a7b7886cc22c9 (diff) | |
| parent | 01163710e71318c6c2fd3f797f6b878f92b7f97b (diff) | |
| download | irssi-7a112e021724af582a06eed8f92fafb772438c13.zip | |
Merge branch 'master' into 'security'
Sync to master
See merge request !6
Diffstat (limited to 'src/fe-common/core/hilight-text.h')
| -rw-r--r-- | src/fe-common/core/hilight-text.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/fe-common/core/hilight-text.h b/src/fe-common/core/hilight-text.h index ae05e1ca..76beec1f 100644 --- a/src/fe-common/core/hilight-text.h +++ b/src/fe-common/core/hilight-text.h @@ -1,7 +1,7 @@ #ifndef __HILIGHT_TEXT_H #define __HILIGHT_TEXT_H -#ifdef HAVE_REGEX_H +#ifndef USE_GREGEX # include <regex.h> #endif @@ -24,7 +24,9 @@ struct _HILIGHT_REC { unsigned int fullword:1; /* match `text' only for full words */ unsigned int regexp:1; /* `text' is a regular expression */ unsigned int case_sensitive:1;/* `text' must match case */ -#ifdef HAVE_REGEX_H +#ifdef USE_GREGEX + GRegex *preg; +#else unsigned int regexp_compiled:1; /* should always be TRUE, unless regexp is invalid */ regex_t preg; #endif |