From 66637f4a2f8e69af70f54b346956839390388ae5 Mon Sep 17 00:00:00 2001 From: "Marc G. Fournier" Date: Sun, 3 Nov 1996 04:57:03 +0000 Subject: [PATCH] Clean up Makefile Add #include "postgres.h" as required Remove #include "utils/elog.h" --- src/backend/storage/buffer/Makefile | 6 ++---- src/backend/storage/buffer/buf_init.c | 5 +++-- src/backend/storage/buffer/buf_table.c | 6 ++++-- src/backend/storage/buffer/bufmgr.c | 5 +++-- src/backend/storage/buffer/freelist.c | 6 ++++-- src/backend/storage/buffer/localbuf.c | 5 +++-- 6 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/backend/storage/buffer/Makefile b/src/backend/storage/buffer/Makefile index d1670ae5ca..a228205488 100644 --- a/src/backend/storage/buffer/Makefile +++ b/src/backend/storage/buffer/Makefile @@ -4,16 +4,14 @@ # Makefile for storage/buffer # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/buffer/Makefile,v 1.1 1996/10/27 09:51:54 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/buffer/Makefile,v 1.2 1996/11/03 04:56:57 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = -I../.. \ - -I../../port/$(PORTNAME) \ - -I../../include \ +INCLUDE_OPT = -I../../port/$(PORTNAME) \ -I../../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/storage/buffer/buf_init.c b/src/backend/storage/buffer/buf_init.c index 823bf41eec..a26611ff56 100644 --- a/src/backend/storage/buffer/buf_init.c +++ b/src/backend/storage/buffer/buf_init.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_init.c,v 1.1.1.1 1996/07/09 06:21:53 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_init.c,v 1.2 1996/11/03 04:56:58 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -16,6 +16,8 @@ #include #include +#include "postgres.h" + /* declarations split between these three files */ #include "storage/buf.h" #include "storage/buf_internals.h" @@ -30,7 +32,6 @@ #include "miscadmin.h" #include "utils/builtins.h" #include "utils/hsearch.h" -#include "utils/elog.h" #include "utils/memutils.h" #include "executor/execdebug.h" /* for NDirectFileRead */ #include "catalog/catalog.h" diff --git a/src/backend/storage/buffer/buf_table.c b/src/backend/storage/buffer/buf_table.c index 01f85612cb..c21c93dec7 100644 --- a/src/backend/storage/buffer/buf_table.c +++ b/src/backend/storage/buffer/buf_table.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_table.c,v 1.2 1996/07/30 07:47:23 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_table.c,v 1.3 1996/11/03 04:56:59 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -25,12 +25,14 @@ * All routines in this file assume buffer manager spinlock is * held by their caller. */ + +#include "postgres.h" + #include "storage/bufmgr.h" #include "storage/buf_internals.h" /* where the declarations go */ #include "storage/shmem.h" #include "storage/spin.h" #include "utils/hsearch.h" -#include "utils/elog.h" static HTAB *SharedBufHash; diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 9dbc105112..dccee668da 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.3 1996/09/19 19:50:48 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.4 1996/11/03 04:57:00 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -51,6 +51,8 @@ #include #include +#include "postgres.h" + /* declarations split between these three files */ #include "storage/buf.h" #include "storage/buf_internals.h" @@ -65,7 +67,6 @@ #include "miscadmin.h" #include "utils/builtins.h" #include "utils/hsearch.h" -#include "utils/elog.h" #include "utils/palloc.h" #include "utils/memutils.h" #include "executor/execdebug.h" /* for NDirectFileRead */ diff --git a/src/backend/storage/buffer/freelist.c b/src/backend/storage/buffer/freelist.c index fabc3c2982..747d551ed0 100644 --- a/src/backend/storage/buffer/freelist.c +++ b/src/backend/storage/buffer/freelist.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/buffer/freelist.c,v 1.1.1.1 1996/07/09 06:21:54 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/freelist.c,v 1.2 1996/11/03 04:57:02 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -24,10 +24,12 @@ * semaphore has been acquired by the caller. */ #include + +#include "postgres.h" + #include "storage/bufmgr.h" #include "storage/buf_internals.h" /* where declarations go */ #include "storage/spin.h" -#include "utils/elog.h" static BufferDesc *SharedFreeList; diff --git a/src/backend/storage/buffer/localbuf.c b/src/backend/storage/buffer/localbuf.c index ec62594086..627dba9c1f 100644 --- a/src/backend/storage/buffer/localbuf.c +++ b/src/backend/storage/buffer/localbuf.c @@ -15,7 +15,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/buffer/localbuf.c,v 1.1.1.1 1996/07/09 06:21:54 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/localbuf.c,v 1.2 1996/11/03 04:57:03 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -24,6 +24,8 @@ #include #include +#include "postgres.h" + /* declarations split between these three files */ #include "storage/buf.h" #include "storage/buf_internals.h" @@ -38,7 +40,6 @@ #include "miscadmin.h" #include "utils/builtins.h" #include "utils/hsearch.h" -#include "utils/elog.h" #include "utils/memutils.h" #include "executor/execdebug.h" /* for NDirectFileRead */ #include "catalog/catalog.h"