summaryrefslogtreecommitdiff
path: root/contrib/tsearch2/wparser_def.c
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2004-10-21 19:49:27 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2004-10-21 19:49:27 +0000
commit3fdd33ab99cf8c6507aa7cabc0f6a9e9dd39d9a7 (patch)
tree14df165850fb73e27569cdf7a1804162e4adc7d4 /contrib/tsearch2/wparser_def.c
parent380bd04c1658795c77b3b808ee766347188fab5f (diff)
downloadpostgresql-3fdd33ab99cf8c6507aa7cabc0f6a9e9dd39d9a7.tar.gz
Avoid macro-redefinition warnings on Windows, per Andrew Dunstan.
Diffstat (limited to 'contrib/tsearch2/wparser_def.c')
-rw-r--r--contrib/tsearch2/wparser_def.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/tsearch2/wparser_def.c b/contrib/tsearch2/wparser_def.c
index 21b41eef8f..93368b1e89 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
{