mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid macro-redefinition warnings on Windows, per Andrew Dunstan.

Browse Source
This commit is contained in:
Tom Lane 2004-10-21 19:49:27 +00:00
parent 380bd04c16
commit 3fdd33ab99
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/tsearch2/rewrite.c
View File

@ -174,6 +174,11 @@ clean_NOT_v2(ITEM * ptr, int4 *len)
return plaintree(clean_NOT_intree(root), 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_UNKNOWN 0
#define V_TRUE 1 #define V_TRUE 1
#define V_FALSE 2 #define V_FALSE 2

4
contrib/tsearch2/wparser_def.c
View File

@ -76,11 +76,11 @@ prsd_end(PG_FUNCTION_ARGS)
#define ENDPUNCTOKEN(x) ( (x)==12 ) #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 HLIDIGNORE(x) ( (x)==5 || (x)==13 || (x)==15 || (x)==16 || (x)==17 )
#define HTMLHLIDIGNORE(x) ( (x)==5 || (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 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 typedef struct
{ {