Commit3fdd33a

committed

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

1 parent380bd04 commit3fdd33aCopy full SHA for 3fdd33a

File tree

-2

lines changed

-2

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -174,6 +174,11 @@ clean_NOT_v2(ITEM * ptr, int4 *len)`
`174`	`174`	`returnplaintree(clean_NOT_intree(root),len);`
`175`	`175`	`}`
`176`	`176`
	`177`	`+`
	`178`	`+#ifdefV_UNKNOWN/* exists in Windows headers */`
	`179`	`+#undef V_UNKNOWN`
	`180`	`+#endif`
	`181`	`+`
`177`	`182`	`#defineV_UNKNOWN0`
`178`	`183`	`#defineV_TRUE1`
`179`	`184`	`#defineV_FALSE2`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -76,11 +76,11 @@ prsd_end(PG_FUNCTION_ARGS)`
`76`	`76`	`#defineENDPUNCTOKEN(x) ( (x)==12 )`
`77`	`77`
`78`	`78`
`79`		`-#defineIDIGNORE(x) ( (x)==13 \|\| (x)==14 \|\| (x)==12 \|\| (x)==23 )`
	`79`	`+#defineTS_IDIGNORE(x) ( (x)==13 \|\| (x)==14 \|\| (x)==12 \|\| (x)==23 )`
`80`	`80`	`#defineHLIDIGNORE(x) ( (x)==5 \|\| (x)==13 \|\| (x)==15 \|\| (x)==16 \|\| (x)==17 )`
`81`	`81`	`#defineHTMLHLIDIGNORE(x) ( (x)==5 \|\| (x)==15 \|\| (x)==16 \|\| (x)==17 )`
`82`	`82`	`#defineNONWORDTOKEN(x) ( (x)==12 \|\| HLIDIGNORE(x) )`
`83`		`-#defineNOENDTOKEN(x)( NONWORDTOKEN(x) \|\| (x)==7 \|\| (x)==8 \|\| (x)==20 \|\| (x)==21 \|\| (x)==22 \|\|IDIGNORE(x) )`
	`83`	`+#defineNOENDTOKEN(x)( NONWORDTOKEN(x) \|\| (x)==7 \|\| (x)==8 \|\| (x)==20 \|\| (x)==21 \|\| (x)==22 \|\|TS_IDIGNORE(x) )`
`84`	`84`
`85`	`85`	`typedefstruct`
`86`	`86`	`{`

Comments

(0)