Commitb1fdc72

committed

Fix Windows build broken in6943a94

Also it fixes dynamic array allocation disallowed by ANSI-C.Author: Stas Kelvich

1 parent8829af4 commitb1fdc72Copy full SHA for b1fdc72

File tree

-2

lines changed

-2

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ typedef struct`
`66`	`66`	`#defineSTATHDRSIZE (offsetof(TSVectorStat, data))`
`67`	`67`
`68`	`68`	`staticDatumtsvector_update_trigger(PG_FUNCTION_ARGS,boolconfig_column);`
`69`		`-staticinttsvector_bsearch(TSVectortsin,char*lexin,intlexin_len);`
	`69`	`+staticinttsvector_bsearch(constTSVectortsv,char*lexeme,intlexeme_len);`
`70`	`70`
`71`	`71`	`/*`
`72`	`72`	`* Order: haspos, len, word, for all positions (pos, weight)`
`@@ -684,10 +684,12 @@ tsvector_to_array(PG_FUNCTION_ARGS)`
`684`	`684`	`{`
`685`	`685`	`TSVectortsin=PG_GETARG_TSVECTOR(0);`
`686`	`686`	`WordEntry*arrin=ARRPTR(tsin);`
`687`		`-Datumelements[tsin->size];`
	`687`	`+Datum*elements;`
`688`	`688`	`inti;`
`689`	`689`	`ArrayType*array;`
`690`	`690`
	`691`	`+elements=palloc(tsin->size*sizeof(Datum));`
	`692`	`+`
`691`	`693`	`for (i=0;i<tsin->size;i++)`
`692`	`694`	`{`
`693`	`695`	`elements[i]=PointerGetDatum(`
`@@ -696,6 +698,8 @@ tsvector_to_array(PG_FUNCTION_ARGS)`
`696`	`698`	`}`
`697`	`699`
`698`	`700`	`array=construct_array(elements,tsin->size,TEXTOID,-1, false,'i');`
	`701`	`+`
	`702`	`+pfree(elements);`
`699`	`703`	`PG_FREE_IF_COPY(tsin,0);`
`700`	`704`	`PG_RETURN_POINTER(array);`
`701`	`705`	`}`

Comments

(0)