diff options
Diffstat (limited to 'src')
25 files changed, 52 insertions, 64 deletions
diff --git a/src/backend/storage/ipc/Makefile b/src/backend/storage/ipc/Makefile index 96e2a059455..6f6701d38b2 100644 --- a/src/backend/storage/ipc/Makefile +++ b/src/backend/storage/ipc/Makefile @@ -4,16 +4,14 @@ # Makefile for storage/ipc # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/ipc/Makefile,v 1.1 1996/10/27 09:52:10 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/ipc/Makefile,v 1.2 1996/11/03 05:06:52 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/ipc/ipc.c b/src/backend/storage/ipc/ipc.c index f74e9644823..b6a9df61c4d 100644 --- a/src/backend/storage/ipc/ipc.c +++ b/src/backend/storage/ipc/ipc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.5 1996/10/31 10:20:06 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.6 1996/11/03 05:06:54 scrappy Exp $ * * NOTES * @@ -37,9 +37,9 @@ #include <sys/shm.h> #endif +#include "postgres.h" #include "storage/ipc.h" #include "utils/memutils.h" -#include "utils/elog.h" #if defined(bsd44) int UsePrivateMemory = 1; diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c index 18d3cccd0ee..6566657f417 100644 --- a/src/backend/storage/ipc/ipci.c +++ b/src/backend/storage/ipc/ipci.c @@ -7,15 +7,14 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.1.1.1 1996/07/09 06:21:54 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.2 1996/11/03 05:06:55 scrappy Exp $ * *------------------------------------------------------------------------- */ -#include "c.h" +#include "postgres.h" #include "storage/ipc.h" #include "storage/multilev.h" -#include "utils/elog.h" #include "storage/sinval.h" #include "storage/bufmgr.h" #include "storage/proc.h" diff --git a/src/backend/storage/ipc/s_lock.c b/src/backend/storage/ipc/s_lock.c index 3fcc8d6c5db..1460fa3584c 100644 --- a/src/backend/storage/ipc/s_lock.c +++ b/src/backend/storage/ipc/s_lock.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/s_lock.c,v 1.5 1996/10/31 10:20:09 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/s_lock.c,v 1.6 1996/11/03 05:06:56 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -40,6 +40,9 @@ #ifdef WIN32 #include <windows.h> #endif /* WIN32 */ + +#include "postgres.h" + #include "storage/ipc.h" diff --git a/src/backend/storage/ipc/shmem.c b/src/backend/storage/ipc/shmem.c index 5a4fb73d2f8..70d3cbe8d9d 100644 --- a/src/backend/storage/ipc/shmem.c +++ b/src/backend/storage/ipc/shmem.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.2 1996/10/31 05:54:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.3 1996/11/03 05:06:57 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -65,7 +65,6 @@ #include "storage/shmem.h" #include "storage/spin.h" #include "utils/hsearch.h" -#include "utils/elog.h" /* shared memory global variables */ diff --git a/src/backend/storage/ipc/shmqueue.c b/src/backend/storage/ipc/shmqueue.c index f08546742b5..2d968376d16 100644 --- a/src/backend/storage/ipc/shmqueue.c +++ b/src/backend/storage/ipc/shmqueue.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmqueue.c,v 1.1.1.1 1996/07/09 06:21:54 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmqueue.c,v 1.2 1996/11/03 05:06:58 scrappy Exp $ * * NOTES * @@ -25,7 +25,6 @@ #include <stdio.h> /* for sprintf() */ #include "postgres.h" #include "storage/shmem.h" /* where the declarations go */ -#include "utils/elog.h" /*#define SHMQUEUE_DEBUG*/ #ifdef SHMQUEUE_DEBUG diff --git a/src/backend/storage/ipc/sinval.c b/src/backend/storage/ipc/sinval.c index a1321020555..c7f88559d24 100644 --- a/src/backend/storage/ipc/sinval.c +++ b/src/backend/storage/ipc/sinval.c @@ -7,12 +7,13 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinval.c,v 1.2 1996/10/31 05:54:43 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinval.c,v 1.3 1996/11/03 05:06:59 scrappy Exp $ * *------------------------------------------------------------------------- */ /* #define INVALIDDEBUG 1 */ +#include <sys/types.h> #include <sys/ipc.h> #include "postgres.h" @@ -20,7 +21,6 @@ #include "storage/sinval.h" #include "storage/sinvaladt.h" #include "storage/spin.h" -#include "utils/elog.h" extern SISeg *shmInvalBuffer;/* the shared buffer segment, set by*/ /* SISegmentAttach() */ diff --git a/src/backend/storage/ipc/sinvaladt.c b/src/backend/storage/ipc/sinvaladt.c index a30afdb6fed..0869a46a830 100644 --- a/src/backend/storage/ipc/sinvaladt.c +++ b/src/backend/storage/ipc/sinvaladt.c @@ -7,14 +7,16 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.1.1.1 1996/07/09 06:21:54 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.2 1996/11/03 05:07:00 scrappy Exp $ * *------------------------------------------------------------------------- */ + +#include "postgres.h" + #include "storage/ipc.h" #include "storage/sinvaladt.h" #include "storage/lmgr.h" -#include "utils/elog.h" #include "utils/palloc.h" /* ---------------- diff --git a/src/backend/storage/ipc/spin.c b/src/backend/storage/ipc/spin.c index 7ff2561f237..8d60aae81b5 100644 --- a/src/backend/storage/ipc/spin.c +++ b/src/backend/storage/ipc/spin.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/spin.c,v 1.1.1.1 1996/07/09 06:21:55 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/spin.c,v 1.2 1996/11/03 05:07:02 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -30,7 +30,6 @@ #include "storage/shmem.h" #include "storage/spin.h" #include "storage/proc.h" -#include "utils/elog.h" /* globals used in this file */ IpcSemaphoreId SpinLockId; diff --git a/src/backend/storage/large_object/Makefile b/src/backend/storage/large_object/Makefile index 4be19106da7..c679d0bb0a7 100644 --- a/src/backend/storage/large_object/Makefile +++ b/src/backend/storage/large_object/Makefile @@ -4,16 +4,14 @@ # Makefile for storage/large_object # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/large_object/Makefile,v 1.1 1996/10/27 09:52:20 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/large_object/Makefile,v 1.2 1996/11/03 05:07:07 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/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c index c61eead7481..719b0e5cb12 100644 --- a/src/backend/storage/large_object/inv_api.c +++ b/src/backend/storage/large_object/inv_api.c @@ -8,13 +8,13 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.2 1996/08/26 06:31:45 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.3 1996/11/03 05:07:10 scrappy Exp $ * *------------------------------------------------------------------------- */ #include <stdio.h> /* for sprintf() */ #include <sys/file.h> -#include "c.h" +#include "postgres.h" #include "libpq/libpq-fs.h" #include "access/genam.h" #include "access/heapam.h" @@ -34,7 +34,6 @@ #include "utils/rel.h" #include "utils/palloc.h" #include "storage/large_object.h" -#include "utils/elog.h" #include "utils/syscache.h" #include "utils/builtins.h" /* for namestrcpy() */ #include "catalog/heap.h" diff --git a/src/backend/storage/lmgr/Makefile b/src/backend/storage/lmgr/Makefile index a96ceb8ba4e..ab4965df92c 100644 --- a/src/backend/storage/lmgr/Makefile +++ b/src/backend/storage/lmgr/Makefile @@ -4,16 +4,14 @@ # Makefile for storage/lmgr # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Makefile,v 1.1 1996/10/27 09:52:27 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Makefile,v 1.2 1996/11/03 05:07:19 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/lmgr/lmgr.c b/src/backend/storage/lmgr/lmgr.c index bfc2f5b2eec..5567189733a 100644 --- a/src/backend/storage/lmgr/lmgr.c +++ b/src/backend/storage/lmgr/lmgr.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.1.1.1 1996/07/09 06:21:56 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.2 1996/11/03 05:07:26 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -34,7 +34,6 @@ #include "storage/multilev.h" #include "storage/lmgr.h" -#include "utils/elog.h" #include "utils/palloc.h" #include "utils/rel.h" diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c index 353f0108dc5..a0777b79cb6 100644 --- a/src/backend/storage/lmgr/lock.c +++ b/src/backend/storage/lmgr/lock.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.3 1996/10/11 03:22:56 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.4 1996/11/03 05:07:29 scrappy Exp $ * * NOTES * Outside modules can create a lock table and acquire/release @@ -32,12 +32,12 @@ *------------------------------------------------------------------------- */ #include <stdio.h> /* for sprintf() */ +#include "postgres.h" #include "storage/shmem.h" #include "storage/spin.h" #include "storage/proc.h" #include "storage/lock.h" #include "utils/hsearch.h" -#include "utils/elog.h" #include "utils/palloc.h" #include "access/xact.h" diff --git a/src/backend/storage/lmgr/multi.c b/src/backend/storage/lmgr/multi.c index c1702d18cb8..22951e4758e 100644 --- a/src/backend/storage/lmgr/multi.c +++ b/src/backend/storage/lmgr/multi.c @@ -12,7 +12,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.1.1.1 1996/07/09 06:21:56 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.2 1996/11/03 05:07:31 scrappy Exp $ * * NOTES: * (1) The lock.c module assumes that the caller here is doing @@ -22,11 +22,11 @@ */ #include <stdio.h> #include <string.h> +#include "postgres.h" #include "storage/lmgr.h" #include "storage/multilev.h" #include "utils/rel.h" -#include "utils/elog.h" #include "miscadmin.h" /* MyDatabaseId */ diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 6588f5cddc8..8ee7b6f78ba 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.6 1996/10/11 03:22:59 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.7 1996/11/03 05:07:32 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -46,7 +46,7 @@ * This is so that we can support more backends. (system-wide semaphore * sets run out pretty fast.) -ay 4/95 * - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.6 1996/10/11 03:22:59 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.7 1996/11/03 05:07:32 scrappy Exp $ */ #include <sys/time.h> #ifndef WIN32 @@ -54,11 +54,12 @@ #endif /* WIN32 */ #include <string.h> #include <sys/types.h> + +#include "postgres.h" #include "libpq/pqsignal.h" /* substitute for <signal.h> */ #include "access/xact.h" #include "utils/hsearch.h" -#include "utils/elog.h" #include "storage/buf.h" #include "storage/lock.h" diff --git a/src/backend/storage/lmgr/single.c b/src/backend/storage/lmgr/single.c index 8d41ea38bb6..20feddbed9f 100644 --- a/src/backend/storage/lmgr/single.c +++ b/src/backend/storage/lmgr/single.c @@ -13,11 +13,14 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/single.c,v 1.1.1.1 1996/07/09 06:21:57 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/single.c,v 1.2 1996/11/03 05:07:33 scrappy Exp $ * *------------------------------------------------------------------------- */ #include <string.h> + +#include "postgres.h" + #include "storage/lmgr.h" /* where the declarations go */ #include "storage/lock.h" #include "storage/multilev.h" diff --git a/src/backend/storage/page/Makefile b/src/backend/storage/page/Makefile index 69fad34546c..53bd2d9967e 100644 --- a/src/backend/storage/page/Makefile +++ b/src/backend/storage/page/Makefile @@ -4,16 +4,14 @@ # Makefile for storage/page # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/page/Makefile,v 1.1 1996/10/27 09:52:34 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/page/Makefile,v 1.2 1996/11/03 05:07:43 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/page/bufpage.c b/src/backend/storage/page/bufpage.c index 14b5ead85bc..77267a152e4 100644 --- a/src/backend/storage/page/bufpage.c +++ b/src/backend/storage/page/bufpage.c @@ -7,19 +7,18 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.1.1.1 1996/07/09 06:21:58 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.2 1996/11/03 05:07:44 scrappy Exp $ * *------------------------------------------------------------------------- */ #include <sys/types.h> #include <sys/file.h> -#include "c.h" +#include "postgres.h" #include "storage/item.h" #include "storage/buf.h" #include "storage/bufmgr.h" -#include "utils/elog.h" #include "utils/palloc.h" #include "utils/memutils.h" #include "storage/bufpage.h" diff --git a/src/backend/storage/page/itemptr.c b/src/backend/storage/page/itemptr.c index 9d063374038..608fbf03379 100644 --- a/src/backend/storage/page/itemptr.c +++ b/src/backend/storage/page/itemptr.c @@ -7,11 +7,11 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/page/itemptr.c,v 1.1.1.1 1996/07/09 06:21:59 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/page/itemptr.c,v 1.2 1996/11/03 05:07:46 scrappy Exp $ * *------------------------------------------------------------------------- */ -#include "c.h" +#include "postgres.h" #include "storage/block.h" #include "storage/off.h" diff --git a/src/backend/storage/smgr/Makefile b/src/backend/storage/smgr/Makefile index 5ef937d503e..a1e02dd8633 100644 --- a/src/backend/storage/smgr/Makefile +++ b/src/backend/storage/smgr/Makefile @@ -4,16 +4,14 @@ # Makefile for storage/smgr # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/storage/smgr/Makefile,v 1.1 1996/10/27 09:52:40 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/storage/smgr/Makefile,v 1.2 1996/11/03 05:07:50 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/smgr/md.c b/src/backend/storage/smgr/md.c index 43330302af0..75b191fa26a 100644 --- a/src/backend/storage/smgr/md.c +++ b/src/backend/storage/smgr/md.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.5 1996/08/27 22:20:26 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.6 1996/11/03 05:07:55 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -17,12 +17,11 @@ #include "postgres.h" #include "miscadmin.h" /* for DataDir */ -#include "storage/smgr.h" /* where the declarations go */ #include "storage/block.h" +#include "storage/smgr.h" /* where the declarations go */ #include "storage/fd.h" #include "utils/mcxt.h" #include "utils/rel.h" -#include "utils/elog.h" #include "utils/palloc.h" #include "catalog/catalog.h" diff --git a/src/backend/storage/smgr/mm.c b/src/backend/storage/smgr/mm.c index 7d514c4247f..44be231185b 100644 --- a/src/backend/storage/smgr/mm.c +++ b/src/backend/storage/smgr/mm.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/smgr/Attic/mm.c,v 1.2 1996/08/27 22:20:27 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/smgr/Attic/mm.c,v 1.3 1996/11/03 05:07:57 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -27,7 +27,6 @@ #include "utils/hsearch.h" #include "utils/rel.h" -#include "utils/elog.h" #include "utils/memutils.h" /* diff --git a/src/backend/storage/smgr/smgr.c b/src/backend/storage/smgr/smgr.c index d8c524a466b..6fcba6448ce 100644 --- a/src/backend/storage/smgr/smgr.c +++ b/src/backend/storage/smgr/smgr.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.2 1996/08/27 22:20:28 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.3 1996/11/03 05:08:00 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -18,10 +18,9 @@ #include "postgres.h" #include "storage/ipc.h" -#include "storage/smgr.h" #include "storage/block.h" +#include "storage/smgr.h" #include "utils/rel.h" -#include "utils/elog.h" #include "utils/palloc.h" typedef struct f_smgr { diff --git a/src/backend/storage/smgr/smgrtype.c b/src/backend/storage/smgr/smgrtype.c index 5c90d590914..cb32d458b82 100644 --- a/src/backend/storage/smgr/smgrtype.c +++ b/src/backend/storage/smgr/smgrtype.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgrtype.c,v 1.1.1.1 1996/07/09 06:21:59 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgrtype.c,v 1.2 1996/11/03 05:08:01 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -15,7 +15,6 @@ #include "postgres.h" #include "utils/builtins.h" /* where the declarations go */ -#include "utils/elog.h" #include "utils/palloc.h" #include "storage/smgr.h" |