*** pgsql/src/include/access/heapam.h	2008/06/12 09:12:31	1.136
--- pgsql/src/include/access/heapam.h	2008/06/19 00:46:06	1.137
***************
*** 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/access/heapam.h,v 1.135 2008/06/06 22:35:22 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/access/heapam.h,v 1.136 2008/06/12 09:12:31 heikki Exp $
   *
   *-------------------------------------------------------------------------
   */
***************
*** 15,25 ****
  #define HEAPAM_H
  
  #include "access/htup.h"
- #include "access/relscan.h"
  #include "access/sdir.h"
  #include "access/xlog.h"
  #include "nodes/primnodes.h"
  #include "storage/lock.h"
  #include "utils/snapshot.h"
  
  
--- 15,27 ----
  #define HEAPAM_H
  
  #include "access/htup.h"
  #include "access/sdir.h"
+ #include "access/skey.h"
  #include "access/xlog.h"
  #include "nodes/primnodes.h"
+ #include "storage/bufpage.h"
  #include "storage/lock.h"
+ #include "utils/relcache.h"
  #include "utils/snapshot.h"
  
  
*************** extern Relation heap_openrv(const RangeV
*** 50,55 ****
--- 52,66 ----
  
  #define heap_close(r,l)  relation_close(r,l)
  
+ /* struct definition appears in relscan.h */
+ typedef struct HeapScanDescData *HeapScanDesc;
+ 
+ /*
+  * HeapScanIsValid
+  *		True iff the heap scan is valid.
+  */
+ #define HeapScanIsValid(scan) PointerIsValid(scan)
+ 
  extern HeapScanDesc heap_beginscan(Relation relation, Snapshot snapshot,
  			   int nkeys, ScanKey key);
  extern HeapScanDesc heap_beginscan_strat(Relation relation, Snapshot snapshot,