diff options
| -rw-r--r-- | contrib/tsearch2/rewrite.c | 5 | ||||
| -rw-r--r-- | contrib/tsearch2/wparser_def.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/contrib/tsearch2/rewrite.c b/contrib/tsearch2/rewrite.c index 4d7294cd74a..e7b5045c9e9 100644 --- a/contrib/tsearch2/rewrite.c +++ b/contrib/tsearch2/rewrite.c @@ -174,6 +174,11 @@ clean_NOT_v2(ITEM * ptr, int4 *len) return plaintree(clean_NOT_intree(root), len); } + +#ifdef V_UNKNOWN /* exists in Windows headers */ +#undef V_UNKNOWN +#endif + #define V_UNKNOWN 0 #define V_TRUE 1 #define V_FALSE 2 diff --git a/contrib/tsearch2/wparser_def.c b/contrib/tsearch2/wparser_def.c index 21b41eef8f6..93368b1e897 100644 --- a/contrib/tsearch2/wparser_def.c +++ b/contrib/tsearch2/wparser_def.c @@ -76,11 +76,11 @@ prsd_end(PG_FUNCTION_ARGS) #define ENDPUNCTOKEN(x) ( (x)==12 ) -#define IDIGNORE(x) ( (x)==13 || (x)==14 || (x)==12 || (x)==23 ) +#define TS_IDIGNORE(x) ( (x)==13 || (x)==14 || (x)==12 || (x)==23 ) #define HLIDIGNORE(x) ( (x)==5 || (x)==13 || (x)==15 || (x)==16 || (x)==17 ) #define HTMLHLIDIGNORE(x) ( (x)==5 || (x)==15 || (x)==16 || (x)==17 ) #define NONWORDTOKEN(x) ( (x)==12 || HLIDIGNORE(x) ) -#define NOENDTOKEN(x) ( NONWORDTOKEN(x) || (x)==7 || (x)==8 || (x)==20 || (x)==21 || (x)==22 || IDIGNORE(x) ) +#define NOENDTOKEN(x) ( NONWORDTOKEN(x) || (x)==7 || (x)==8 || (x)==20 || (x)==21 || (x)==22 || TS_IDIGNORE(x) ) typedef struct { |