From 2b1d8bd29a3adb4facc2968ad666159c5567f77f Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Mon, 20 Nov 2000 16:47:32 +0000 Subject: [PATCH] Include postgres.h before checking #ifdef XLOG. --- src/backend/access/transam/varsup.c | 12 +++++------- src/backend/access/transam/xlogutils.c | 4 ++-- src/backend/storage/buffer/bufmgr.c | 7 +++---- src/backend/storage/buffer/localbuf.c | 8 +++----- 4 files changed, 13 insertions(+), 18 deletions(-) diff --git a/src/backend/access/transam/varsup.c b/src/backend/access/transam/varsup.c index 8c7d98ca707..75a568f8fde 100644 --- a/src/backend/access/transam/varsup.c +++ b/src/backend/access/transam/varsup.c @@ -8,18 +8,16 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/transam/varsup.c,v 1.32 2000/11/08 22:09:55 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/varsup.c,v 1.33 2000/11/20 16:47:30 petere Exp $ * *------------------------------------------------------------------------- */ -#ifdef XLOG - -#include "xlog_varsup.c" - -#else - #include "postgres.h" +#ifdef XLOG +#include "xlog_varsup.c" +#else + #include "access/heapam.h" #include "catalog/catname.h" #include "storage/proc.h" diff --git a/src/backend/access/transam/xlogutils.c b/src/backend/access/transam/xlogutils.c index b6442787334..dd6ca09acff 100644 --- a/src/backend/access/transam/xlogutils.c +++ b/src/backend/access/transam/xlogutils.c @@ -9,10 +9,10 @@ *------------------------------------------------------------------------- */ -#ifdef XLOG - #include "postgres.h" +#ifdef XLOG + #include "access/xlog.h" #include "access/transam.h" #include "access/xact.h" diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 8d40e8d952f..907e8194743 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.93 2000/11/08 22:09:59 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.94 2000/11/20 16:47:31 petere Exp $ * *------------------------------------------------------------------------- */ @@ -43,10 +43,10 @@ * buf_table.c -- manages the buffer lookup table */ +#include "postgres.h" + #ifdef XLOG - #include "xlog_bufmgr.c" - #else #include @@ -54,7 +54,6 @@ #include #include -#include "postgres.h" #include "executor/execdebug.h" #include "miscadmin.h" #include "storage/s_lock.h" diff --git a/src/backend/storage/buffer/localbuf.c b/src/backend/storage/buffer/localbuf.c index 352f519bdc0..7a841a354ad 100644 --- a/src/backend/storage/buffer/localbuf.c +++ b/src/backend/storage/buffer/localbuf.c @@ -16,15 +16,15 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/buffer/localbuf.c,v 1.34 2000/11/08 22:09:59 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/localbuf.c,v 1.35 2000/11/20 16:47:32 petere Exp $ * *------------------------------------------------------------------------- */ +#include "postgres.h" + #ifdef XLOG - #include "xlog_localbuf.c" - #else #include @@ -32,8 +32,6 @@ #include #include -#include "postgres.h" - #include "executor/execdebug.h" #include "storage/smgr.h" #include "utils/relcache.h"