*** pgsql/src/include/storage/bufpage.h	2008/06/06 22:35:22	1.80
--- pgsql/src/include/storage/bufpage.h	2008/06/08 22:00:48	1.81
***************
*** 7,13 ****
   * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
   * Portions Copyright (c) 1994, Regents of the University of California
   *
!  * $PostgreSQL: pgsql/src/include/storage/bufpage.h,v 1.79 2008/05/12 16:06:10 alvherre Exp $
   *
   *-------------------------------------------------------------------------
   */
--- 7,13 ----
   * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
   * Portions Copyright (c) 1994, Regents of the University of California
   *
!  * $PostgreSQL: pgsql/src/include/storage/bufpage.h,v 1.80 2008/06/06 22:35:22 alvherre Exp $
   *
   *-------------------------------------------------------------------------
   */
***************
*** 15,21 ****
  #define BUFPAGE_H
  
  #include "access/xlogdefs.h"
- #include "storage/bufmgr.h"
  #include "storage/item.h"
  #include "storage/off.h"
  
--- 15,20 ----
*************** typedef PageHeaderData *PageHeader;
*** 291,319 ****
  )
  
  /*
-  * BufferGetPageSize
-  *		Returns the page size within a buffer.
-  *
-  * Notes:
-  *		Assumes buffer is valid.
-  *
-  *		The buffer can be a raw disk block and need not contain a valid
-  *		(formatted) disk page.
-  */
- /* XXX should dig out of buffer descriptor */
- #define BufferGetPageSize(buffer) \
- ( \
- 	AssertMacro(BufferIsValid(buffer)), \
- 	(Size)BLCKSZ \
- )
- 
- /*
-  * BufferGetPage
-  *		Returns the page associated with a buffer.
-  */
- #define BufferGetPage(buffer) ((Page)BufferGetBlock(buffer))
- 
- /*
   * PageGetMaxOffsetNumber
   *		Returns the maximum offset number used by the given page.
   *		Since offset numbers are 1-based, this is also the number
--- 290,295 ----