Clean up Makefile

Add #include "postgres.h" as required

Remove #include "utils/elog.h"

diff --git a/src/backend/storage/buffer/Makefile b/src/backend/storage/buffer/Makefile
index d1670ae5ca476a6bcff7723383cd3ab93e479a2e..a228205488acdf8819e009e16f49710a8a14672e 100644 (file)
--- 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 823bf41eecfb3091f89fba7c3e48670216fb945a..a26611ff568d1a938f05a52122290479d6b65cc5 100644 (file)
--- 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 <math.h>
 #include <signal.h>
 
+#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 01f85612cbc381ae33af4e842c2e7407ca567a7b..c21c93dec7e68aca0e3d943e55aa42dff3573a30 100644 (file)
--- 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 9dbc105112aa0e755ef35240f72b3712d341ed2f..dccee668da82c9652048d23bf9158e7d83adcb1d 100644 (file)
--- 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 <math.h>
 #include <signal.h>
 
+#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 fabc3c29829a489aeda9051d9c24b6d5a7df5776..747d551ed0aafc453fdc7a756b40acbf21152592 100644 (file)
--- 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 <stdio.h>
+
+#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 ec6259408674e2ba40693ee67ce3dcf6296fcc2e..627dba9c1fff973b0962acd3e0823b304919bfc0 100644 (file)
--- 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 <math.h>
 #include <signal.h>
 
+#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"