diff options
Diffstat (limited to 'src')
29 files changed, 73 insertions, 75 deletions
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c index 96f5b54533f..9c5f9d4dfab 100644 --- a/src/backend/libpq/hba.c +++ b/src/backend/libpq/hba.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.4 1996/10/31 10:16:08 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.5 1996/11/03 06:52:13 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -20,13 +20,14 @@ #include <netinet/in.h> #include <arpa/inet.h> #if defined(sparc_solaris) -#include <port/inet_aton.h> +#include "port/inet_aton.h" #endif -#include <miscadmin.h> -#include <libpq/libpq.h> -#include <libpq/pqcomm.h> -#include <libpq/hba.h> +#include "postgres.h" +#include "miscadmin.h" +#include "libpq/libpq.h" +#include "libpq/pqcomm.h" +#include "libpq/hba.h" #define CONF_FILE "pg_hba.conf" diff --git a/src/backend/libpq/pqsignal.c b/src/backend/libpq/pqsignal.c index b60a5659ccb..67bbc16fbaa 100644 --- a/src/backend/libpq/pqsignal.c +++ b/src/backend/libpq/pqsignal.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/pqsignal.c,v 1.1.1.1 1996/07/09 06:21:31 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/pqsignal.c,v 1.2 1996/11/03 06:52:14 scrappy Exp $ * * NOTES * This shouldn't be in libpq, but the monitor and some other @@ -16,6 +16,8 @@ * *------------------------------------------------------------------------- */ +#include "postgres.h" + #include "libpq/pqsignal.h" pqsigfunc diff --git a/src/backend/tcop/Makefile b/src/backend/tcop/Makefile index 12c29caea38..bc31448ab0f 100644 --- a/src/backend/tcop/Makefile +++ b/src/backend/tcop/Makefile @@ -4,16 +4,14 @@ # Makefile for tcop # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.2 1996/10/31 05:55:23 momjian Exp $ +# $Header: /cvsroot/pgsql/src/backend/tcop/Makefile,v 1.3 1996/11/03 06:52:27 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/tcop/aclchk.c b/src/backend/tcop/aclchk.c index 75353013c6f..f8d43fad005 100644 --- a/src/backend/tcop/aclchk.c +++ b/src/backend/tcop/aclchk.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/Attic/aclchk.c,v 1.2 1996/10/31 05:55:24 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/Attic/aclchk.c,v 1.3 1996/11/03 06:52:29 scrappy Exp $ * * NOTES * See acl.h. @@ -15,12 +15,13 @@ *------------------------------------------------------------------------- */ #include <string.h> +#include "postgres.h" + #include "utils/acl.h" /* where declarations for this file goes */ #include "access/heapam.h" #include "access/htup.h" #include "access/tupmacs.h" #include "utils/builtins.h" -#include "utils/elog.h" #include "utils/palloc.h" #include "catalog/indexing.h" #include "catalog/catalog.h" diff --git a/src/backend/tcop/dest.c b/src/backend/tcop/dest.c index 0e10c1403e0..ed95cfb623a 100644 --- a/src/backend/tcop/dest.c +++ b/src/backend/tcop/dest.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.1.1.1 1996/07/09 06:21:59 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.2 1996/11/03 06:52:31 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -30,7 +30,6 @@ #include "libpq/libpq-be.h" #include "access/printtup.h" #include "utils/portal.h" -#include "utils/elog.h" #include "utils/palloc.h" #include "executor/executor.h" diff --git a/src/backend/tcop/fastpath.c b/src/backend/tcop/fastpath.c index 39014fe0db1..273caa49421 100644 --- a/src/backend/tcop/fastpath.c +++ b/src/backend/tcop/fastpath.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.1.1.1 1996/07/09 06:21:59 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.2 1996/11/03 06:52:32 scrappy Exp $ * * NOTES * This cruft is the server side of PQfn. @@ -63,7 +63,6 @@ #include "utils/palloc.h" #include "fmgr.h" -#include "utils/elog.h" #include "utils/builtins.h" /* for oideq */ #include "tcop/fastpath.h" #include "libpq/libpq.h" diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 3d5b61e7764..43d7e6a59bb 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.12 1996/10/31 10:20:56 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.13 1996/11/03 06:52:33 scrappy Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -65,7 +65,6 @@ #include "storage/bufmgr.h" #include "fmgr.h" -#include "utils/elog.h" #include "utils/palloc.h" #include "utils/rel.h" @@ -1265,7 +1264,7 @@ PostgresMain(int argc, char *argv[]) */ if (IsUnderPostmaster == false) { puts("\nPOSTGRES backend interactive interface"); - puts("$Revision: 1.12 $ $Date: 1996/10/31 10:20:56 $"); + puts("$Revision: 1.13 $ $Date: 1996/11/03 06:52:33 $"); } /* ---------------- diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c index 4f185f2e683..3cd3197e1e8 100644 --- a/src/backend/tcop/pquery.c +++ b/src/backend/tcop/pquery.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.2 1996/07/30 07:41:38 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.3 1996/11/03 06:52:35 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -15,8 +15,8 @@ #include "tcop/tcopdebug.h" -#include "utils/elog.h" #include "utils/palloc.h" +#include "nodes/nodes.h" #include "utils/mcxt.h" #include "miscadmin.h" #include "utils/portal.h" diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c index 1cfde29c90e..8dd10bb59ba 100644 --- a/src/backend/tcop/utility.c +++ b/src/backend/tcop/utility.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.4 1996/11/02 02:03:13 bryanh Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.5 1996/11/03 06:52:36 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -35,7 +35,6 @@ #include "nodes/parsenodes.h" #include "parse.h" -#include "utils/elog.h" #include "utils/builtins.h" #include "utils/acl.h" #include "utils/palloc.h" diff --git a/src/backend/tioga/Makefile b/src/backend/tioga/Makefile index ec46c5abdcd..b8ca54c0346 100644 --- a/src/backend/tioga/Makefile +++ b/src/backend/tioga/Makefile @@ -4,16 +4,15 @@ # Makefile for tioga # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/tioga/Attic/Makefile,v 1.1 1996/10/27 09:53:00 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/tioga/Attic/Makefile,v 1.2 1996/11/03 06:52:43 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../.. include ../../Makefile.global -INCLUDE_OPT = -I.. \ +INCLUDE_OPT = -I../port/$(PORTNAME) \ - -I../include \ -I../../include CFLAGS+=$(INCLUDE_OPT) diff --git a/src/backend/tioga/tgRecipe.c b/src/backend/tioga/tgRecipe.c index ea52a715104..e51a61b94d4 100644 --- a/src/backend/tioga/tgRecipe.c +++ b/src/backend/tioga/tgRecipe.c @@ -11,12 +11,13 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tioga/Attic/tgRecipe.c,v 1.1.1.1 1996/07/09 06:22:00 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/tioga/Attic/tgRecipe.c,v 1.2 1996/11/03 06:52:45 scrappy Exp $ * *------------------------------------------------------------------------- */ #include <stdlib.h> +#include "postgres.h" #include "tioga/tgRecipe.h" #include "catalog/catalog.h" /*for newoid() */ diff --git a/src/backend/utils/adt/Makefile b/src/backend/utils/adt/Makefile index 954582a0b0d..2427f8417c1 100644 --- a/src/backend/utils/adt/Makefile +++ b/src/backend/utils/adt/Makefile @@ -4,16 +4,14 @@ # Makefile for utils/adt # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.1 1996/10/27 09:53:15 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/adt/Makefile,v 1.2 1996/11/03 06:52:59 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/utils/adt/acl.c b/src/backend/utils/adt/acl.c index 7e625987fe7..97f9c6e47f2 100644 --- a/src/backend/utils/adt/acl.c +++ b/src/backend/utils/adt/acl.c @@ -7,23 +7,19 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.2 1996/08/27 07:32:25 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.3 1996/11/03 06:53:01 scrappy Exp $ * *------------------------------------------------------------------------- */ - -#include "config.h" - #include <ctype.h> #include <string.h> #include "postgres.h" -#include "c.h" #include "utils/acl.h" #include "access/htup.h" #include "catalog/pg_user.h" #include "utils/syscache.h" -#include "utils/elog.h" #include "utils/palloc.h" +#include "miscadmin.h" static char *getid(char *s, char *n); static int32 aclitemeq(AclItem *a1, AclItem *a2); diff --git a/src/backend/utils/adt/bool.c b/src/backend/utils/adt/bool.c index d0f3d34b52a..058920a1d7f 100644 --- a/src/backend/utils/adt/bool.c +++ b/src/backend/utils/adt/bool.c @@ -7,12 +7,14 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/bool.c,v 1.1.1.1 1996/07/09 06:22:03 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/bool.c,v 1.2 1996/11/03 06:53:03 scrappy Exp $ * *------------------------------------------------------------------------- */ + +#include "postgres.h" + #include "utils/builtins.h" /* where the declarations go */ -#include "utils/elog.h" #include "utils/palloc.h" /***************************************************************************** diff --git a/src/backend/utils/adt/dt.c b/src/backend/utils/adt/dt.c index bc162427d28..c9a53230cb0 100644 --- a/src/backend/utils/adt/dt.c +++ b/src/backend/utils/adt/dt.c @@ -7,11 +7,11 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.1.1.1 1996/07/09 06:22:04 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.2 1996/11/03 06:53:04 scrappy Exp $ * *------------------------------------------------------------------------- */ -#include "c.h" +#include "postgres.h" #include "utils/palloc.h" #include "utils/builtins.h" /* where function declarations go */ diff --git a/src/backend/utils/adt/filename.c b/src/backend/utils/adt/filename.c index 6f7da084bd1..c569041dd39 100644 --- a/src/backend/utils/adt/filename.c +++ b/src/backend/utils/adt/filename.c @@ -7,13 +7,11 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.2 1996/08/27 07:32:32 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.3 1996/11/03 06:53:05 scrappy Exp $ * *------------------------------------------------------------------------- */ -#include "config.h" - #include <string.h> #include <stdio.h> #ifndef WIN32 @@ -21,7 +19,8 @@ #endif /* WIN32 */ #include <sys/param.h> -#include "utils/elog.h" + +#include "postgres.h" #include "utils/palloc.h" #include "utils/builtins.h" /* where function declarations go */ diff --git a/src/backend/utils/adt/geo-ops.c b/src/backend/utils/adt/geo-ops.c index d47eda81afa..c41654b4461 100644 --- a/src/backend/utils/adt/geo-ops.c +++ b/src/backend/utils/adt/geo-ops.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/geo-ops.c,v 1.2 1996/07/22 21:56:01 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/geo-ops.c,v 1.3 1996/11/03 06:53:06 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -16,8 +16,9 @@ #include <stdio.h> /* for sprintf proto, etc. */ #include <string.h> +#include "postgres.h" + #include "utils/geo-decls.h" -#include "utils/elog.h" #include "utils/palloc.h" #define LDELIM '(' diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 5807808fcdd..c8d7bf49ec5 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -12,19 +12,20 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.3 1996/08/26 06:32:06 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.4 1996/11/03 06:53:08 scrappy Exp $ * *------------------------------------------------------------------------- */ #include <stdio.h> #include <string.h> +#include "postgres.h" + #include "access/heapam.h" #include "utils/tqual.h" /* for NowTimeQual */ #include "fmgr.h" #include "utils/builtins.h" /* for textout() prototype and where the declarations go */ -#include "utils/elog.h" #include "utils/palloc.h" #include "catalog/catname.h" diff --git a/src/backend/utils/cache/Makefile b/src/backend/utils/cache/Makefile index c944479c58c..e6dfb24841f 100644 --- a/src/backend/utils/cache/Makefile +++ b/src/backend/utils/cache/Makefile @@ -4,16 +4,14 @@ # Makefile for utils/cache # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/cache/Makefile,v 1.1 1996/10/27 09:53:26 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/cache/Makefile,v 1.2 1996/11/03 06:53:14 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/utils/cache/fcache.c b/src/backend/utils/cache/fcache.c index 070f457c280..2f2b76bf276 100644 --- a/src/backend/utils/cache/fcache.c +++ b/src/backend/utils/cache/fcache.c @@ -7,11 +7,11 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/fcache.c,v 1.1.1.1 1996/07/09 06:22:06 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/fcache.c,v 1.2 1996/11/03 06:53:17 scrappy Exp $ * *------------------------------------------------------------------------- */ -#include "c.h" +#include "postgres.h" #include "access/htup.h" #include "utils/catcache.h" #include "utils/syscache.h" @@ -22,7 +22,6 @@ #include "parser/parsetree.h" /* for getrelname() */ #include "utils/builtins.h" #include "utils/fcache.h" -#include "utils/elog.h" #include "utils/palloc.h" #include "nodes/primnodes.h" #include "nodes/execnodes.h" diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c index 8c90db09d0d..c4dc5ac8eb9 100644 --- a/src/backend/utils/cache/syscache.c +++ b/src/backend/utils/cache/syscache.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.2 1996/08/15 07:42:52 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.3 1996/11/03 06:53:19 scrappy Exp $ * * NOTES * These routines allow the parser/planner/executor to perform @@ -17,13 +17,12 @@ * *------------------------------------------------------------------------- */ -#include "c.h" +#include "postgres.h" #include "access/heapam.h" #include "access/htup.h" #include "catalog/catname.h" #include "utils/catcache.h" -#include "utils/elog.h" #include "utils/palloc.h" #include "nodes/pg_list.h" diff --git a/src/backend/utils/error/exc.c b/src/backend/utils/error/exc.c index 61714bf970c..59ec7b00866 100644 --- a/src/backend/utils/error/exc.c +++ b/src/backend/utils/error/exc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.4 1996/10/31 10:23:28 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.5 1996/11/03 06:53:26 scrappy Exp $ * * NOTE * XXX this code needs improvement--check for state violations and @@ -17,6 +17,9 @@ */ #include <stdio.h> /* XXX use own I/O routines */ #include <errno.h> + +#include "postgres.h" + #include "utils/exc.h" #include "storage/ipc.h" diff --git a/src/backend/utils/error/excabort.c b/src/backend/utils/error/excabort.c index d1b14361ea5..29fd64ab7d5 100644 --- a/src/backend/utils/error/excabort.c +++ b/src/backend/utils/error/excabort.c @@ -7,10 +7,13 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/excabort.c,v 1.1.1.1 1996/07/09 06:22:07 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/excabort.c,v 1.2 1996/11/03 06:53:32 scrappy Exp $ * *------------------------------------------------------------------------- */ + +#include "postgres.h" + #include "utils/exc.h" /* where function declarations go */ void diff --git a/src/backend/utils/error/excid.c b/src/backend/utils/error/excid.c index 4d87c16344f..410d7a56c88 100644 --- a/src/backend/utils/error/excid.c +++ b/src/backend/utils/error/excid.c @@ -7,10 +7,13 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/excid.c,v 1.1.1.1 1996/07/09 06:22:07 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/excid.c,v 1.2 1996/11/03 06:53:35 scrappy Exp $ * *------------------------------------------------------------------------- */ + +#include "postgres.h" + #include "utils/excid.h" /***************************************************************************** diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c index 66477f55675..83efc5ea5c2 100644 --- a/src/backend/utils/hash/dynahash.c +++ b/src/backend/utils/hash/dynahash.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.1.1.1 1996/07/09 06:22:08 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.2 1996/11/03 06:54:13 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -45,11 +45,9 @@ # include "postgres.h" # include "utils/hsearch.h" #ifndef FRONTEND -# include "nodes/memnodes.h" # include "utils/mcxt.h" #endif /* !FRONTEND */ # include "utils/palloc.h" -# include "utils/elog.h" /* * Fast arithmetic, relying on powers of 2, diff --git a/src/backend/utils/hash/hashfn.c b/src/backend/utils/hash/hashfn.c index 2a25b8a59e1..7c11724ded8 100644 --- a/src/backend/utils/hash/hashfn.c +++ b/src/backend/utils/hash/hashfn.c @@ -7,11 +7,13 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/hash/hashfn.c,v 1.1.1.1 1996/07/09 06:22:08 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/hash/hashfn.c,v 1.2 1996/11/03 06:54:16 scrappy Exp $ * *------------------------------------------------------------------------- */ #include <string.h> +#include "postgres.h" + #include "utils/hsearch.h" /* diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c index b43e85a0793..9dd621e3225 100644 --- a/src/backend/utils/mmgr/portalmem.c +++ b/src/backend/utils/mmgr/portalmem.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.1.1.1 1996/07/09 06:22:09 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.2 1996/11/03 06:54:25 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -76,12 +76,11 @@ #include <stdio.h> /* for sprintf() */ #include <string.h> /* for strlen, strncpy */ -#include "c.h" +#include "postgres.h" #include "lib/hasht.h" #include "utils/module.h" #include "utils/excid.h" /* for Unimplemented */ -#include "utils/elog.h" #include "utils/mcxt.h" #include "utils/hsearch.h" diff --git a/src/backend/utils/sort/lselect.c b/src/backend/utils/sort/lselect.c index 1f92e48d838..635dbd771cd 100644 --- a/src/backend/utils/sort/lselect.c +++ b/src/backend/utils/sort/lselect.c @@ -8,14 +8,14 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/lselect.c,v 1.1.1.1 1996/07/09 06:22:10 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/lselect.c,v 1.2 1996/11/03 06:54:35 scrappy Exp $ * *------------------------------------------------------------------------- */ #include <string.h> #include <stdio.h> -#include "c.h" +#include "postgres.h" #include "storage/buf.h" #include "access/skey.h" diff --git a/src/backend/utils/sort/psort.c b/src/backend/utils/sort/psort.c index 8e7187b434f..a85e5bc8d38 100644 --- a/src/backend/utils/sort/psort.c +++ b/src/backend/utils/sort/psort.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/psort.c,v 1.1.1.1 1996/07/09 06:22:10 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/psort.c,v 1.2 1996/11/03 06:54:38 scrappy Exp $ * * NOTES * Sorts the first relation into the second relation. The sort may @@ -22,7 +22,7 @@ #include <stdio.h> #include <math.h> -#include "c.h" +#include "postgres.h" #include "executor/execdebug.h" #include "access/heapam.h" @@ -34,7 +34,6 @@ #include "storage/buf.h" #include "storage/bufmgr.h" /* for BLCKSZ */ #include "utils/portal.h" /* for {Start,End}PortalAllocMode */ -#include "utils/elog.h" #include "utils/rel.h" #include "utils/psort.h" |