*** pgsql/src/include/access/gin.h	2008/07/11 21:06:29	1.23
--- pgsql/src/include/access/gin.h	2008/07/13 21:50:04	1.24
***************
*** 4,10 ****
   *
   *	Copyright (c) 2006-2008, PostgreSQL Global Development Group
   *
!  *	$PostgreSQL: pgsql/src/include/access/gin.h,v 1.22 2008/06/19 00:46:05 alvherre Exp $
   *--------------------------------------------------------------------------
   */
  
--- 4,10 ----
   *
   *	Copyright (c) 2006-2008, PostgreSQL Global Development Group
   *
!  *	$PostgreSQL: pgsql/src/include/access/gin.h,v 1.23 2008/07/11 21:06:29 tgl Exp $
   *--------------------------------------------------------------------------
   */
  
*************** typedef struct
*** 121,137 ****
  /*
   * Data (posting tree) pages
   */
  #define GinDataPageGetData(page)	\
! 	(PageGetContents(page)+MAXALIGN(sizeof(ItemPointerData)))
! #define GinDataPageGetRightBound(page)	((ItemPointer)PageGetContents(page))
! #define GinSizeOfItem(page) ( (GinPageIsLeaf(page)) ? sizeof(ItemPointerData) : sizeof(PostingItem) )
! #define GinDataPageGetItem(page,i) ( GinDataPageGetData(page) + ((i)-1) * GinSizeOfItem(page) )
  
  #define GinDataPageGetFreeSpace(page)	\
! 	( BLCKSZ - SizeOfPageHeaderData - MAXALIGN(sizeof(GinPageOpaqueData)) - \
! 		GinPageGetOpaque(page)->maxoff * GinSizeOfItem(page) - \
! 		MAXALIGN(sizeof(ItemPointerData)))
! 
  
  
  #define GIN_UNLOCK	BUFFER_LOCK_UNLOCK
--- 121,139 ----
  /*
   * Data (posting tree) pages
   */
+ #define GinDataPageGetRightBound(page)	((ItemPointer) PageGetContents(page))
  #define GinDataPageGetData(page)	\
! 	(PageGetContents(page) + MAXALIGN(sizeof(ItemPointerData)))
! #define GinSizeOfItem(page)	\
! 	(GinPageIsLeaf(page) ? sizeof(ItemPointerData) : sizeof(PostingItem))
! #define GinDataPageGetItem(page,i)	\
! 	(GinDataPageGetData(page) + ((i)-1) * GinSizeOfItem(page))
  
  #define GinDataPageGetFreeSpace(page)	\
! 	(BLCKSZ - MAXALIGN(SizeOfPageHeaderData) \
! 	 - MAXALIGN(sizeof(ItemPointerData)) \
! 	 - GinPageGetOpaque(page)->maxoff * GinSizeOfItem(page) \
! 	 - MAXALIGN(sizeof(GinPageOpaqueData)))
  
  
  #define GIN_UNLOCK	BUFFER_LOCK_UNLOCK