diff options
Diffstat (limited to 'src/backend/utils')
-rw-r--r-- | src/backend/utils/adt/acl.c | 3 | ||||
-rw-r--r-- | src/backend/utils/adt/arrayfuncs.c | 5 | ||||
-rw-r--r-- | src/backend/utils/adt/arrayutils.c | 4 | ||||
-rw-r--r-- | src/backend/utils/adt/chunk.c | 3 | ||||
-rw-r--r-- | src/backend/utils/adt/date.c | 4 | ||||
-rw-r--r-- | src/backend/utils/adt/datetimes.c | 4 | ||||
-rw-r--r-- | src/backend/utils/adt/datum.c | 3 | ||||
-rw-r--r-- | src/backend/utils/adt/float.c | 3 | ||||
-rw-r--r-- | src/backend/utils/adt/int.c | 3 | ||||
-rw-r--r-- | src/backend/utils/adt/like.c | 3 | ||||
-rw-r--r-- | src/backend/utils/adt/nabstime.c | 4 | ||||
-rw-r--r-- | src/backend/utils/adt/not_in.c | 5 | ||||
-rw-r--r-- | src/backend/utils/adt/numutils.c | 3 | ||||
-rw-r--r-- | src/backend/utils/adt/oid.c | 3 | ||||
-rw-r--r-- | src/backend/utils/adt/oidname.c | 3 | ||||
-rw-r--r-- | src/backend/utils/adt/regexp.c | 3 | ||||
-rw-r--r-- | src/backend/utils/adt/regproc.c | 5 | ||||
-rw-r--r-- | src/backend/utils/adt/sets.c | 5 | ||||
-rw-r--r-- | src/backend/utils/adt/tid.c | 5 | ||||
-rw-r--r-- | src/backend/utils/adt/varchar.c | 3 | ||||
-rw-r--r-- | src/backend/utils/adt/varlena.c | 3 | ||||
-rw-r--r-- | src/backend/utils/misc/Makefile | 6 |
22 files changed, 24 insertions, 59 deletions
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c index 97f9c6e47f2..74e70285c07 100644 --- a/src/backend/utils/adt/acl.c +++ b/src/backend/utils/adt/acl.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.3 1996/11/03 06:53:01 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.4 1996/11/06 06:49:34 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -15,7 +15,6 @@ #include <string.h> #include "postgres.h" #include "utils/acl.h" -#include "access/htup.h" #include "catalog/pg_user.h" #include "utils/syscache.h" #include "utils/palloc.h" diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c index 30b0589d11f..fca9fe083ae 100644 --- a/src/backend/utils/adt/arrayfuncs.c +++ b/src/backend/utils/adt/arrayfuncs.c @@ -7,13 +7,11 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.7 1996/11/04 04:19:49 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.8 1996/11/06 06:49:36 scrappy Exp $ * *------------------------------------------------------------------------- */ -#include "config.h" - #include <ctype.h> #include <stdio.h> @@ -27,7 +25,6 @@ #include "utils/memutils.h" #include "storage/fd.h" /* for SEEK_ */ #include "fmgr.h" -#include "utils/elog.h" #include "utils/array.h" #include "libpq/libpq-fs.h" diff --git a/src/backend/utils/adt/arrayutils.c b/src/backend/utils/adt/arrayutils.c index 9a16b950f2b..5f175df0319 100644 --- a/src/backend/utils/adt/arrayutils.c +++ b/src/backend/utils/adt/arrayutils.c @@ -7,14 +7,14 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayutils.c,v 1.1.1.1 1996/07/09 06:22:03 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayutils.c,v 1.2 1996/11/06 06:49:41 scrappy Exp $ * *------------------------------------------------------------------------- */ #define WEAK_C_OPTIMIZER -#include "c.h" +#include "postgres.h" int GetOffset(int n, int dim[], int lb[], int indx[]) diff --git a/src/backend/utils/adt/chunk.c b/src/backend/utils/adt/chunk.c index ca0cb2647ea..f3ae8e996c3 100644 --- a/src/backend/utils/adt/chunk.c +++ b/src/backend/utils/adt/chunk.c @@ -6,7 +6,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/chunk.c,v 1.1.1.1 1996/07/09 06:22:03 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/chunk.c,v 1.2 1996/11/06 06:49:43 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -21,7 +21,6 @@ #include "utils/palloc.h" #include "fmgr.h" -#include "utils/elog.h" #include "utils/array.h" #include "optimizer/internal.h" diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c index d9eaf1227e8..5ef0e723d83 100644 --- a/src/backend/utils/adt/date.c +++ b/src/backend/utils/adt/date.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.1.1.1 1996/07/09 06:22:03 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.2 1996/11/06 06:49:44 scrappy Exp $ * * NOTES * This code is actually (almost) unused. @@ -34,9 +34,7 @@ #include "miscadmin.h" #include "access/xact.h" #include "utils/builtins.h" /* where function declarations go */ -#include "utils/elog.h" #include "utils/palloc.h" -#include "utils/nabstime.h" #define TM_YEAR_BASE 1900 /* compatible to UNIX time */ #define EPOCH_YEAR 1970 /* compatible to UNIX time */ diff --git a/src/backend/utils/adt/datetimes.c b/src/backend/utils/adt/datetimes.c index e4b9efa6637..06f2e373d72 100644 --- a/src/backend/utils/adt/datetimes.c +++ b/src/backend/utils/adt/datetimes.c @@ -7,17 +7,15 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/datetimes.c,v 1.4 1996/10/25 06:02:52 bryanh Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/datetimes.c,v 1.5 1996/11/06 06:49:45 scrappy Exp $ * *------------------------------------------------------------------------- */ #include <stdio.h> /* for sprintf() */ #include <string.h> -#include <config.h> #include <postgres.h> #include <utils/palloc.h> -#include <utils/elog.h> /* these things look like structs, but we pass them by value so be careful For example, passing an int -> DateADT is not portable! */ diff --git a/src/backend/utils/adt/datum.c b/src/backend/utils/adt/datum.c index e982fc7607f..f833e58a467 100644 --- a/src/backend/utils/adt/datum.c +++ b/src/backend/utils/adt/datum.c @@ -6,7 +6,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/datum.c,v 1.1.1.1 1996/07/09 06:22:03 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/datum.c,v 1.2 1996/11/06 06:49:47 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -31,7 +31,6 @@ #include "postgres.h" #include "utils/datum.h" #include "catalog/pg_type.h" -#include "utils/elog.h" #include "utils/palloc.h" /*------------------------------------------------------------------------- diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c index 6affe0691e6..310c839fa28 100644 --- a/src/backend/utils/adt/float.c +++ b/src/backend/utils/adt/float.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.6 1996/10/31 10:23:17 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.7 1996/11/06 06:49:48 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -53,7 +53,6 @@ #include "postgres.h" #include "fmgr.h" #include "utils/builtins.h" /* for ftod() prototype */ -#include "utils/elog.h" #include "utils/palloc.h" diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c index cbf4a0cba10..07cdce82e4b 100644 --- a/src/backend/utils/adt/int.c +++ b/src/backend/utils/adt/int.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.1.1.1 1996/07/09 06:22:04 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.2 1996/11/06 06:49:49 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -32,7 +32,6 @@ #include "postgres.h" #include "fmgr.h" #include "utils/builtins.h" /* where the declarations go */ -#include "utils/elog.h" #include "utils/palloc.h" /***************************************************************************** diff --git a/src/backend/utils/adt/like.c b/src/backend/utils/adt/like.c index 4560b6d80d3..127d59a2812 100644 --- a/src/backend/utils/adt/like.c +++ b/src/backend/utils/adt/like.c @@ -19,7 +19,6 @@ */ #include <string.h> #include "postgres.h" /* postgres system include file */ -#include "utils/elog.h" /* for logging postgres errors */ #include "utils/palloc.h" #include "utils/builtins.h" /* where the function declarations go */ @@ -143,7 +142,7 @@ bool textnlike(struct varlena *s, struct varlena *p) } -/* $Revision: 1.2 $ +/* $Revision: 1.3 $ ** "like.c" A first attempt at a LIKE operator for Postgres95. ** ** Originally written by Rich $alz, mirror!rs, Wed Nov 26 19:03:17 EST 1986. diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c index ea59ee2e7b3..ecdfebd18c0 100644 --- a/src/backend/utils/adt/nabstime.c +++ b/src/backend/utils/adt/nabstime.c @@ -7,18 +7,16 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.5 1996/10/17 23:59:45 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.6 1996/11/06 06:49:51 scrappy Exp $ * *------------------------------------------------------------------------- */ #include <stdio.h> #include <ctype.h> #include <string.h> -#include <time.h> #include <sys/types.h> #include "postgres.h" #include "access/xact.h" -#include "utils/nabstime.h" #include "utils/palloc.h" #define MAXDATEFIELDS 25 diff --git a/src/backend/utils/adt/not_in.c b/src/backend/utils/adt/not_in.c index 47c28c4eda2..5222f3d2986 100644 --- a/src/backend/utils/adt/not_in.c +++ b/src/backend/utils/adt/not_in.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/not_in.c,v 1.1.1.1 1996/07/09 06:22:05 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/not_in.c,v 1.2 1996/11/06 06:49:53 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -26,10 +26,7 @@ #include <string.h> #include "postgres.h" #include "access/heapam.h" -#include "access/htup.h" #include "access/relscan.h" -#include "utils/rel.h" -#include "utils/elog.h" #include "utils/builtins.h" /* where function decls go */ /* ---------------------------------------------------------------- diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c index b331d45426f..c654c63d372 100644 --- a/src/backend/utils/adt/numutils.c +++ b/src/backend/utils/adt/numutils.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.4 1996/10/31 10:23:19 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.5 1996/11/06 06:49:54 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -19,7 +19,6 @@ #include <math.h> #include "postgres.h" #include "utils/builtins.h" /* where the declarations go */ -#include "utils/elog.h" int32 pg_atoi(char *s, int size, int c) diff --git a/src/backend/utils/adt/oid.c b/src/backend/utils/adt/oid.c index d049db8b7f1..d423853da15 100644 --- a/src/backend/utils/adt/oid.c +++ b/src/backend/utils/adt/oid.c @@ -7,14 +7,13 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.1.1.1 1996/07/09 06:22:05 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.2 1996/11/06 06:49:55 scrappy Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" #include "utils/palloc.h" #include "utils/builtins.h" /* where function declarations go */ -#include "utils/elog.h" /***************************************************************************** * USER I/O ROUTINES * diff --git a/src/backend/utils/adt/oidname.c b/src/backend/utils/adt/oidname.c index c4f42674c5f..d4d1290aa89 100644 --- a/src/backend/utils/adt/oidname.c +++ b/src/backend/utils/adt/oidname.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/oidname.c,v 1.1.1.1 1996/07/09 06:22:05 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/oidname.c,v 1.2 1996/11/06 06:49:56 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -18,7 +18,6 @@ #include "postgres.h" #include "utils/oidcompos.h" /* where function declarations go */ #include "utils/builtins.h" /* for pg_atoi() */ -#include "utils/elog.h" #include "utils/palloc.h" OidName diff --git a/src/backend/utils/adt/regexp.c b/src/backend/utils/adt/regexp.c index 670ad48f6ca..80da6e0f431 100644 --- a/src/backend/utils/adt/regexp.c +++ b/src/backend/utils/adt/regexp.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.2 1996/07/09 06:39:19 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.3 1996/11/06 06:49:58 scrappy Exp $ * * Alistair Crooks added the code for the regex caching * agc - cached the regular expressions used - there's a good chance @@ -29,7 +29,6 @@ */ #include <string.h> #include "postgres.h" /* postgres system include file */ -#include "utils/elog.h" /* for logging postgres errors */ #include "utils/palloc.h" #include "utils/builtins.h" /* where the function declarations go */ diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c index 071573fdccc..63010c3cd7c 100644 --- a/src/backend/utils/adt/regproc.c +++ b/src/backend/utils/adt/regproc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.1.1.1 1996/07/09 06:22:05 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.2 1996/11/06 06:49:59 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -15,10 +15,7 @@ #include "postgres.h" #include "access/heapam.h" #include "access/relscan.h" -#include "access/skey.h" -#include "utils/tqual.h" /* for NowTimeQual */ #include "fmgr.h" -#include "utils/elog.h" #include "utils/palloc.h" #include "catalog/catname.h" diff --git a/src/backend/utils/adt/sets.c b/src/backend/utils/adt/sets.c index 9ad8d457820..fea167340ec 100644 --- a/src/backend/utils/adt/sets.c +++ b/src/backend/utils/adt/sets.c @@ -9,15 +9,12 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.1.1.1 1996/07/09 06:22:05 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.2 1996/11/06 06:50:01 scrappy Exp $ * *------------------------------------------------------------------------- */ #include <stdio.h> /* for sprintf() */ #include "postgres.h" -#include "utils/elog.h" -#include "nodes/pg_list.h" /* for LispValue and List */ -#include "access/htup.h" /* for HeapTuple */ #include "access/heapam.h" #include "access/relscan.h" #include "access/xact.h" diff --git a/src/backend/utils/adt/tid.c b/src/backend/utils/adt/tid.c index 6690b74c023..6fb4e589ad8 100644 --- a/src/backend/utils/adt/tid.c +++ b/src/backend/utils/adt/tid.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.1.1.1 1996/07/09 06:22:05 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.2 1996/11/06 06:50:05 scrappy Exp $ * * NOTES * input routine largely stolen from boxin(). @@ -17,9 +17,6 @@ #include <stdio.h> /* for sprintf() */ #include <string.h> #include "postgres.h" -#include "storage/block.h" -#include "storage/off.h" -#include "storage/itemptr.h" #include "storage/bufpage.h" #include "utils/palloc.h" diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c index e687db4d08f..5c5531882ed 100644 --- a/src/backend/utils/adt/varchar.c +++ b/src/backend/utils/adt/varchar.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.4 1996/11/04 04:53:37 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.5 1996/11/06 06:50:06 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -15,7 +15,6 @@ #include <string.h> #include "postgres.h" #include "utils/palloc.h" -#include "utils/elog.h" /* * CHAR() and VARCHAR() types are part of the ANSI SQL standard. CHAR() diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c index 5695f1c1810..230f987f8c7 100644 --- a/src/backend/utils/adt/varlena.c +++ b/src/backend/utils/adt/varlena.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.6 1996/09/23 08:31:01 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.7 1996/11/06 06:50:07 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -15,7 +15,6 @@ #include <string.h> #include "postgres.h" -#include "utils/elog.h" #include "utils/palloc.h" #include "utils/builtins.h" /* where function declarations go */ diff --git a/src/backend/utils/misc/Makefile b/src/backend/utils/misc/Makefile index 39f52138a31..c12c8b765d4 100644 --- a/src/backend/utils/misc/Makefile +++ b/src/backend/utils/misc/Makefile @@ -4,16 +4,14 @@ # Makefile for utils/misc # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/misc/Makefile,v 1.1 1996/11/02 02:06:46 bryanh Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/misc/Makefile,v 1.2 1996/11/06 06:52:23 scrappy Exp $ # #------------------------------------------------------------------------- SRCDIR = ../../.. include ../../../Makefile.global -INCLUDE_OPT = \ - -I../../port/$(PORTNAME) \ - -I../../include \ +INCLUDE_OPT = -I../../port/$(PORTNAME) \ -I../../../include CFLAGS += $(INCLUDE_OPT) |