Fix breakage caused by conflicting patches, as evidenced by the buildfarm.

alvherre · alvherre · commit 7f15f8f2e7a8 · 2008-06-08T23:16:43.000Z
diff --git a/src/backend/access/index/genam.c b/src/backend/access/index/genam.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/index/genam.c,v 1.69 2008/06/08 22:41:04 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/index/genam.c,v 1.70 2008/06/08 23:16:43 alvherre Exp $
  *
  * NOTES
  *	  many of the old access method routines have been turned into
@@ -24,6 +24,7 @@
 #include "access/transam.h"
 #include "miscadmin.h"
 #include "pgstat.h"
+#include "storage/bufmgr.h"
 #include "utils/tqual.h"
 
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/access/index/genam.c,v 1.69 2008/06/08 22:41:04 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/access/index/genam.c,v 1.70 2008/06/08 23:16:43 alvherre Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* many of the old access method routines have been turned into`
`@@ -24,6 +24,7 @@`
`24`	`24`	`#include "access/transam.h"`
`25`	`25`	`#include "miscadmin.h"`
`26`	`26`	`#include "pgstat.h"`
	`27`	`+#include "storage/bufmgr.h"`
`27`	`28`	`#include "utils/tqual.h"`
`28`	`29`
`29`	`30`