77 *
88 *
99 * IDENTIFICATION
10- * $PostgreSQL: pgsql/src/backend/utils/adt/tsginidx.c,v 1.12 2008/05/16 16:31:01 tgl Exp $
10+ * $PostgreSQL: pgsql/src/backend/utils/adt/tsginidx.c,v 1.13 2008/12/02 11:30:53 heikki Exp $
1111 *
1212 *-------------------------------------------------------------------------
1313 */
2222Datum
2323gin_cmp_tslexeme (PG_FUNCTION_ARGS )
2424{
25- text * a = PG_GETARG_TEXT_P (0 );
26- text * b = PG_GETARG_TEXT_P (1 );
25+ text * a = PG_GETARG_TEXT_PP (0 );
26+ text * b = PG_GETARG_TEXT_PP (1 );
2727int cmp ;
2828
2929cmp = tsCompareString (
30- VARDATA (a ),VARSIZE (a )- VARHDRSZ ,
31- VARDATA (b ),VARSIZE (b )- VARHDRSZ ,
30+ VARDATA_ANY (a ),VARSIZE_ANY_EXHDR (a ),
31+ VARDATA_ANY (b ),VARSIZE_ANY_EXHDR (b ),
3232false );
3333
3434PG_FREE_IF_COPY (a ,0 );
@@ -39,16 +39,16 @@ gin_cmp_tslexeme(PG_FUNCTION_ARGS)
3939Datum
4040gin_cmp_prefix (PG_FUNCTION_ARGS )
4141{
42- text * a = PG_GETARG_TEXT_P (0 );
43- text * b = PG_GETARG_TEXT_P (1 );
42+ text * a = PG_GETARG_TEXT_PP (0 );
43+ text * b = PG_GETARG_TEXT_PP (1 );
4444#ifdef NOT_USED
4545StrategyNumber strategy = PG_GETARG_UINT16 (2 );
4646#endif
4747int cmp ;
4848
4949cmp = tsCompareString (
50- VARDATA (a ),VARSIZE (a )- VARHDRSZ ,
51- VARDATA (b ),VARSIZE (b )- VARHDRSZ ,
50+ VARDATA_ANY (a ),VARSIZE_ANY_EXHDR (a ),
51+ VARDATA_ANY (b ),VARSIZE_ANY_EXHDR (b ),
5252true );
5353
5454if (cmp < 0 )