diff options
Diffstat (limited to 'src/backend/utils')
49 files changed, 50 insertions, 124 deletions
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c index b0e59e3ff08..0d97bb0a1c5 100644 --- a/src/backend/utils/adt/arrayfuncs.c +++ b/src/backend/utils/adt/arrayfuncs.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.43 1999/05/25 16:11:50 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.44 1999/07/15 15:20:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,7 +27,6 @@ #include "storage/fd.h" #include "fmgr.h" #include "utils/array.h" -#include "utils/elog.h" #include "libpq/libpq-fs.h" #include "libpq/be-fsstubs.h" diff --git a/src/backend/utils/adt/arrayutils.c b/src/backend/utils/adt/arrayutils.c index a0fe502895a..4514a3bcc55 100644 --- a/src/backend/utils/adt/arrayutils.c +++ b/src/backend/utils/adt/arrayutils.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayutils.c,v 1.7 1999/02/13 23:19:02 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayutils.c,v 1.8 1999/07/15 15:20:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,8 +16,6 @@ #include "postgres.h" -#include "utils/array.h" - int GetOffset(int n, int *dim, int *lb, int *indx) { diff --git a/src/backend/utils/adt/bool.c b/src/backend/utils/adt/bool.c index d0ac12f4f26..a05ababecbd 100644 --- a/src/backend/utils/adt/bool.c +++ b/src/backend/utils/adt/bool.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/bool.c,v 1.17 1999/07/14 01:19:56 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/bool.c,v 1.18 1999/07/15 15:20:11 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,8 +16,6 @@ #include "postgres.h" #include "utils/builtins.h" /* where the declarations go */ -#include "utils/palloc.h" -#include "utils/mcxt.h" /***************************************************************************** * USER I/O ROUTINES * diff --git a/src/backend/utils/adt/cash.c b/src/backend/utils/adt/cash.c index dd363ee083d..6cfa0520557 100644 --- a/src/backend/utils/adt/cash.c +++ b/src/backend/utils/adt/cash.c @@ -9,7 +9,7 @@ * workings can be found in the book "Software Solutions in C" by * Dale Schumacher, Academic Press, ISBN: 0-12-632360-7. * - * $Header: /cvsroot/pgsql/src/backend/utils/adt/cash.c,v 1.29 1999/07/14 01:19:57 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/cash.c,v 1.30 1999/07/15 15:20:11 momjian Exp $ */ #include <stdio.h> @@ -22,7 +22,6 @@ #include "miscadmin.h" #include "utils/builtins.h" #include "utils/cash.h" -#include "utils/mcxt.h" static const char *num_word(Cash value); diff --git a/src/backend/utils/adt/char.c b/src/backend/utils/adt/char.c index 9eaa721b493..97f0c22f2a8 100644 --- a/src/backend/utils/adt/char.c +++ b/src/backend/utils/adt/char.c @@ -8,16 +8,14 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/char.c,v 1.23 1999/07/14 01:19:58 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/char.c,v 1.24 1999/07/15 15:20:12 momjian Exp $ * *------------------------------------------------------------------------- */ #include <stdio.h> /* for sprintf() */ #include <string.h> #include "postgres.h" -#include "utils/palloc.h" #include "utils/builtins.h" /* where the declarations go */ -#include "utils/mcxt.h" /***************************************************************************** * USER I/O ROUTINES * diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c index b4a2519831c..c3feaa50636 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.33 1999/07/14 01:19:59 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.34 1999/07/15 15:20:13 momjian Exp $ * * NOTES * This code is actually (almost) unused. @@ -40,9 +40,7 @@ #endif #include "access/xact.h" #include "utils/builtins.h" /* where function declarations go */ -#include "utils/palloc.h" #include "utils/dt.h" -#include "utils/mcxt.h" #define INVALID_RELTIME_STR "Undefined RelTime" #define INVALID_RELTIME_STR_LEN (sizeof(INVALID_RELTIME_STR)-1) diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index 59624602808..0c87ce5a644 100644 --- a/src/backend/utils/adt/datetime.c +++ b/src/backend/utils/adt/datetime.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.34 1999/07/14 01:19:59 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.35 1999/07/15 15:20:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,7 +24,6 @@ #include "utils/nabstime.h" #include "utils/datetime.h" #include "access/xact.h" -#include "utils/mcxt.h" static int date2tm(DateADT dateVal, int *tzp, struct tm * tm, double *fsec, char **tzn); diff --git a/src/backend/utils/adt/datum.c b/src/backend/utils/adt/datum.c index bfdd61271af..1c774616d5c 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.13 1999/07/14 01:20:00 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/datum.c,v 1.14 1999/07/15 15:20:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,8 +31,6 @@ #include "postgres.h" #include "utils/datum.h" #include "catalog/pg_type.h" -#include "utils/palloc.h" -#include "utils/mcxt.h" /*------------------------------------------------------------------------- * datumGetSize diff --git a/src/backend/utils/adt/dt.c b/src/backend/utils/adt/dt.c index 3040cf0b31a..6e6dc717eb7 100644 --- a/src/backend/utils/adt/dt.c +++ b/src/backend/utils/adt/dt.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.73 1999/07/14 01:20:01 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.74 1999/07/15 15:20:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,7 +30,6 @@ #include <sys/timeb.h> #endif #include "utils/builtins.h" -#include "utils/mcxt.h" static int DecodeDate(char *str, int fmask, int *tmask, struct tm * tm); static int DecodeNumber(int flen, char *field, diff --git a/src/backend/utils/adt/filename.c b/src/backend/utils/adt/filename.c index be224f1bf79..0b2c0dd250d 100644 --- a/src/backend/utils/adt/filename.c +++ b/src/backend/utils/adt/filename.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.18 1999/07/14 01:20:02 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.19 1999/07/15 15:20:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,7 +21,6 @@ #include "postgres.h" #include <miscadmin.h> #include "utils/builtins.h" /* where function declarations go */ -#include "utils/mcxt.h" char * filename_in(char *file) diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c index 6b4eb7af610..daf830e552f 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.44 1999/07/14 01:20:03 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.45 1999/07/15 15:20:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -61,8 +61,6 @@ #endif #include "fmgr.h" #include "utils/builtins.h" /* for ftod() prototype */ -#include "utils/palloc.h" -#include "utils/mcxt.h" #ifndef NAN #define NAN (0.0/0.0) diff --git a/src/backend/utils/adt/geo_ops.c b/src/backend/utils/adt/geo_ops.c index 1b3fc643e10..743a823c2a8 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/geo_ops.c,v 1.42 1999/07/14 01:20:03 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.43 1999/07/15 15:20:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,8 +22,6 @@ #include "postgres.h" #include "utils/geo_decls.h" -#include "utils/palloc.h" -#include "utils/mcxt.h" #ifndef PI #define PI 3.1415926536 diff --git a/src/backend/utils/adt/geo_selfuncs.c b/src/backend/utils/adt/geo_selfuncs.c index 083f3e2e409..4a246d705f9 100644 --- a/src/backend/utils/adt/geo_selfuncs.c +++ b/src/backend/utils/adt/geo_selfuncs.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_selfuncs.c,v 1.9 1999/07/14 01:20:04 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_selfuncs.c,v 1.10 1999/07/15 15:20:17 momjian Exp $ * * XXX These are totally bogus. * @@ -18,9 +18,7 @@ #include "access/attnum.h" #include "utils/geo_decls.h" /* where function declarations go */ -#include "utils/palloc.h" #include "utils/builtins.h" -#include "utils/mcxt.h" float64 areasel(Oid opid, diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c index d66f9240bd1..f26dc35a8ac 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.22 1999/07/14 01:20:05 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.23 1999/07/15 15:20:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -37,7 +37,6 @@ #include "postgres.h" #include "fmgr.h" #include "utils/builtins.h" /* where the declarations go */ -#include "utils/mcxt.h" #ifndef SHRT_MAX #define SHRT_MAX (0x7FFF) diff --git a/src/backend/utils/adt/int8.c b/src/backend/utils/adt/int8.c index d8170dcd2e6..6b2be8a5a02 100644 --- a/src/backend/utils/adt/int8.c +++ b/src/backend/utils/adt/int8.c @@ -15,9 +15,7 @@ #include <limits.h> #include "postgres.h" -#include "utils/palloc.h" #include "utils/int8.h" -#include "utils/mcxt.h" #define MAXINT8LEN 25 diff --git a/src/backend/utils/adt/like.c b/src/backend/utils/adt/like.c index 7586b637699..09925bb8302 100644 --- a/src/backend/utils/adt/like.c +++ b/src/backend/utils/adt/like.c @@ -19,10 +19,8 @@ */ #include <string.h> #include "postgres.h" /* postgres system include file */ -#include "utils/palloc.h" #include "utils/builtins.h" /* where the function declarations go */ #include "mb/pg_wchar.h" -#include "utils/mcxt.h" static int like(pg_wchar * text, pg_wchar * p); @@ -112,7 +110,7 @@ textnlike(struct varlena * s, struct varlena * p) } -/* $Revision: 1.26 $ +/* $Revision: 1.27 $ ** "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/mac.c b/src/backend/utils/adt/mac.c index 96588d97113..03a7a4e4790 100644 --- a/src/backend/utils/adt/mac.c +++ b/src/backend/utils/adt/mac.c @@ -1,17 +1,15 @@ /* * PostgreSQL type definitions for MAC addresses. * - * $Id: mac.c,v 1.9 1999/07/14 01:20:05 momjian Exp $ + * $Id: mac.c,v 1.10 1999/07/15 15:20:18 momjian Exp $ */ #include <stdio.h> #include <string.h> #include <postgres.h> -#include <utils/palloc.h> #include <utils/builtins.h> #include <utils/inet.h> -#include "utils/mcxt.h" manufacturer manufacturers[] = { {0x00, 0x00, 0x0C, "Cisco"}, diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c index 4af6f1216cb..304e91d2060 100644 --- a/src/backend/utils/adt/nabstime.c +++ b/src/backend/utils/adt/nabstime.c @@ -4,7 +4,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nabstime.c,v 1.56 1999/07/14 01:20:05 momjian Exp $ + * $Id: nabstime.c,v 1.57 1999/07/15 15:20:18 momjian Exp $ * */ #include <stdio.h> @@ -25,7 +25,6 @@ #endif #include "utils/builtins.h" #include "access/xact.h" -#include "utils/mcxt.h" static AbsoluteTime tm2abstime(struct tm * tm, int tz); diff --git a/src/backend/utils/adt/name.c b/src/backend/utils/adt/name.c index c0b403099a3..e04ad84cc62 100644 --- a/src/backend/utils/adt/name.c +++ b/src/backend/utils/adt/name.c @@ -11,15 +11,13 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.19 1999/07/14 01:20:06 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.20 1999/07/15 15:20:18 momjian Exp $ * *------------------------------------------------------------------------- */ #include <string.h> #include "postgres.h" #include "utils/builtins.h" /* where the declarations go */ -#include "utils/palloc.h" /* where the declarations go */ -#include "utils/mcxt.h" /***************************************************************************** * USER I/O ROUTINES (none) * diff --git a/src/backend/utils/adt/network.c b/src/backend/utils/adt/network.c index 0bbc185f906..1b56dfa4cb0 100644 --- a/src/backend/utils/adt/network.c +++ b/src/backend/utils/adt/network.c @@ -3,7 +3,7 @@ * is for IP V4 CIDR notation, but prepared for V6: just * add the necessary bits where the comments indicate. * - * $Id: network.c,v 1.11 1999/07/14 01:20:06 momjian Exp $ + * $Id: network.c,v 1.12 1999/07/15 15:20:18 momjian Exp $ * Jon Postel RIP 16 Oct 1998 */ @@ -18,10 +18,8 @@ #include <arpa/inet.h> #include <postgres.h> -#include <utils/palloc.h> #include <utils/builtins.h> #include <utils/inet.h> -#include "utils/mcxt.h" static int v4bitncmp(unsigned int a1, unsigned int a2, int bits); diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c index e1063adf671..cfe6beaff76 100644 --- a/src/backend/utils/adt/numeric.c +++ b/src/backend/utils/adt/numeric.c @@ -5,7 +5,7 @@ * * 1998 Jan Wieck * - * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.17 1999/07/14 01:20:06 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.18 1999/07/15 15:20:18 momjian Exp $ * * ---------- */ @@ -21,9 +21,7 @@ #include "postgres.h" #include "utils/builtins.h" -#include "utils/palloc.h" #include "utils/numeric.h" -#include "utils/mcxt.h" /* ---------- * Uncomment the following to enable compilation of dump_numeric() diff --git a/src/backend/utils/adt/oid.c b/src/backend/utils/adt/oid.c index 3ddc4534ec7..ec55bcd451d 100644 --- a/src/backend/utils/adt/oid.c +++ b/src/backend/utils/adt/oid.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.24 1999/07/14 01:20:06 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.25 1999/07/15 15:20:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,7 +17,6 @@ #include "postgres.h" #include "utils/builtins.h" /* where function declarations go */ -#include "utils/mcxt.h" /***************************************************************************** * USER I/O ROUTINES * diff --git a/src/backend/utils/adt/oracle_compat.c b/src/backend/utils/adt/oracle_compat.c index 205477ce477..50be811b22c 100644 --- a/src/backend/utils/adt/oracle_compat.c +++ b/src/backend/utils/adt/oracle_compat.c @@ -1,14 +1,13 @@ /* * Edmund Mergl <E.Mergl@bawue.de> * - * $Id: oracle_compat.c,v 1.19 1999/07/14 01:20:06 momjian Exp $ + * $Id: oracle_compat.c,v 1.20 1999/07/15 15:20:19 momjian Exp $ * */ #include <ctype.h> #include "postgres.h" -#include "utils/mcxt.h" text *lower(text *string); text *upper(text *string); diff --git a/src/backend/utils/adt/regexp.c b/src/backend/utils/adt/regexp.c index daf8cb1e69e..c53b5350119 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.23 1999/07/14 01:20:07 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.24 1999/07/15 15:20:19 momjian Exp $ * * Alistair Crooks added the code for the regex caching * agc - cached the regular expressions used - there's a good chance @@ -33,7 +33,6 @@ #include <regex/regex.h> #include "utils/builtins.h" /* where the function declarations go */ -#include "utils/mcxt.h" #if defined(DISABLE_XOPEN_NLS) #undef _XOPEN_SOURCE diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c index 1db8ddcc057..3a2a0323642 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.37 1999/05/25 16:12:17 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.38 1999/07/15 15:20:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,7 +20,6 @@ #include "access/relscan.h" #include "storage/bufmgr.h" #include "fmgr.h" -#include "utils/palloc.h" #include "utils/syscache.h" #include "catalog/catname.h" diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index 6df5fb04ad7..928705ef22e 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -3,7 +3,7 @@ * out of it's tuple * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.18 1999/06/02 11:52:28 wieck Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.19 1999/07/15 15:20:19 momjian Exp $ * * This software is copyrighted by Jan Wieck - Hamburg. * @@ -44,7 +44,6 @@ #include "executor/spi.h" #include "commands/trigger.h" -#include "utils/elog.h" #include "utils/builtins.h" #include "nodes/nodes.h" #include "optimizer/clauses.h" diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index fe11c77b193..359267653b9 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -12,7 +12,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.30 1999/06/19 00:44:44 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.31 1999/07/15 15:20:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,7 +25,6 @@ #include "fmgr.h" #include "utils/builtins.h" /* for textout() prototype and where the * declarations go */ -#include "utils/palloc.h" #include "catalog/catname.h" #include "utils/syscache.h" diff --git a/src/backend/utils/adt/tid.c b/src/backend/utils/adt/tid.c index 60c368502be..5a9bae512e8 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.7 1999/07/14 01:20:07 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.8 1999/07/15 15:20:20 momjian Exp $ * * NOTES * input routine largely stolen from boxin(). @@ -19,9 +19,7 @@ #include "postgres.h" #include "storage/bufpage.h" -#include "utils/palloc.h" #include "utils/builtins.h" /* where function declarations go */ -#include "utils/mcxt.h" #define LDELIM '(' #define RDELIM ')' diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c index 6e1da178da6..3c67ab854e2 100644 --- a/src/backend/utils/adt/timestamp.c +++ b/src/backend/utils/adt/timestamp.c @@ -6,7 +6,6 @@ #include "miscadmin.h" #include "utils/builtins.h" #include "access/xact.h" -#include "utils/mcxt.h" time_t timestamp_in(const char *timestamp_str) diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c index d7bb2738cb8..868412f46f8 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.48 1999/07/04 04:56:00 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.49 1999/07/15 15:20:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,10 +18,11 @@ #include "utils/array.h" #include "utils/builtins.h" #include "catalog/pg_type.h" +#include "storage/bufpage.h" +#include "utils/memutils.h" #ifdef CYR_RECODE char *convertstr(char *, int, int); - #endif #include "mb/pg_wchar.h" diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c index e31d5f4d3df..61b07f97fea 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.49 1999/07/14 01:20:07 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.50 1999/07/15 15:20:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,9 +15,7 @@ #include <string.h> #include "postgres.h" -#include "utils/palloc.h" #include "utils/builtins.h" /* where function declarations go */ -#include "utils/mcxt.h" #include "mb/pg_wchar.h" diff --git a/src/backend/utils/adt/version.c b/src/backend/utils/adt/version.c index 98e76f78a59..a756a2ca9c8 100644 --- a/src/backend/utils/adt/version.c +++ b/src/backend/utils/adt/version.c @@ -5,7 +5,7 @@ * * IDENTIFICATION * - * $Header: /cvsroot/pgsql/src/backend/utils/adt/version.c,v 1.7 1999/07/14 01:20:08 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/version.c,v 1.8 1999/07/15 15:20:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,7 +15,6 @@ #include "postgres.h" #include "version.h" -#include "utils/mcxt.h" text *version(void); diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index 8224c935786..c4044158ea0 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.43 1999/06/04 02:19:45 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.44 1999/07/15 15:20:21 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,9 +19,6 @@ #include "utils/builtins.h" #include "utils/portal.h" #include "utils/catcache.h" -#include "utils/elog.h" -#include "utils/palloc.h" -#include "utils/mcxt.h" #include "utils/rel.h" #include "storage/bufpage.h" #include "access/valid.h" diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c index be590044418..cb99900ea6a 100644 --- a/src/backend/utils/cache/lsyscache.c +++ b/src/backend/utils/cache/lsyscache.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.27 1999/05/29 01:45:21 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.28 1999/07/15 15:20:22 momjian Exp $ * * NOTES * Eventually, the index information should go through here, too. @@ -21,8 +21,6 @@ #include "utils/lsyscache.h" #include "access/tupmacs.h" #include "utils/rel.h" -#include "utils/palloc.h" -#include "utils/elog.h" #include "access/attnum.h" #include "access/heapam.h" diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c index f8c73b7b22c..7184f76985e 100644 --- a/src/backend/utils/cache/relcache.c +++ b/src/backend/utils/cache/relcache.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.62 1999/05/25 16:12:23 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.63 1999/07/15 15:20:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -73,7 +73,6 @@ #include "utils/builtins.h" #include "utils/catcache.h" #include "utils/hsearch.h" -#include "utils/mcxt.h" #include "utils/memutils.h" #include "utils/rel.h" #include "utils/relcache.h" diff --git a/src/backend/utils/cache/temprel.c b/src/backend/utils/cache/temprel.c index 6635ac2bd49..0d817ec012e 100644 --- a/src/backend/utils/cache/temprel.c +++ b/src/backend/utils/cache/temprel.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.6 1999/07/03 15:43:57 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.7 1999/07/15 15:20:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,7 +28,6 @@ #include "postgres.h" #include "miscadmin.h" #include "nodes/pg_list.h" -#include "utils/mcxt.h" #include "utils/temprel.h" #include "access/xact.h" #include "access/htup.h" diff --git a/src/backend/utils/error/excid.c b/src/backend/utils/error/excid.c index 70842f3b565..c22b8e696c6 100644 --- a/src/backend/utils/error/excid.c +++ b/src/backend/utils/error/excid.c @@ -7,15 +7,13 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/excid.c,v 1.6 1999/05/25 16:12:26 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/excid.c,v 1.7 1999/07/15 15:20:26 momjian Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" -#include "utils/excid.h" - /***************************************************************************** * Generic Recoverable Exceptions * *****************************************************************************/ diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c index 7d9b79575fd..b5cf429e7f1 100644 --- a/src/backend/utils/fmgr/dfmgr.c +++ b/src/backend/utils/fmgr/dfmgr.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.26 1999/05/25 16:12:27 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.27 1999/07/15 15:20:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,7 +21,6 @@ #include "config.h" /* for MAXPATHLEN */ #include "fmgr.h" /* generated by Gen_fmgrtab.sh */ #include "utils/dynamic_loader.h" -#include "utils/elog.h" #include "utils/builtins.h" #include "access/heapam.h" #include "nodes/pg_list.h" diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c index d5b24cf3410..8658da21a4e 100644 --- a/src/backend/utils/fmgr/fmgr.c +++ b/src/backend/utils/fmgr/fmgr.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.28 1999/05/25 16:12:28 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.29 1999/07/15 15:20:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,7 +28,6 @@ #include "nodes/params.h" #include "utils/builtins.h" -#include "utils/elog.h" #include "nodes/parsenodes.h" #include "commands/trigger.h" diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c index 28ee6a15dee..5b00ed9b0f4 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.23 1999/05/31 17:01:52 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.24 1999/07/15 15:20:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -46,9 +46,7 @@ #include "utils/dynahash.h" #include "utils/hsearch.h" #ifndef FRONTEND -#include "utils/mcxt.h" #endif /* !FRONTEND */ -#include "utils/palloc.h" #include "utils/memutils.h" /* diff --git a/src/backend/utils/init/enbl.c b/src/backend/utils/init/enbl.c index 78c5ab10403..f2ac69fba77 100644 --- a/src/backend/utils/init/enbl.c +++ b/src/backend/utils/init/enbl.c @@ -7,12 +7,11 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/enbl.c,v 1.7 1999/05/25 16:12:33 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/enbl.c,v 1.8 1999/07/15 15:20:32 momjian Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" -#include "utils/module.h" /* where the declarations go */ /* * BypassEnable diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c index 1d4225e5821..1ef5a00fe45 100644 --- a/src/backend/utils/init/globals.c +++ b/src/backend/utils/init/globals.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.30 1999/05/25 16:12:34 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.31 1999/07/15 15:20:34 momjian Exp $ * * NOTES * Globals used all over the place should be declared here and not @@ -31,7 +31,6 @@ #include "storage/sinval.h" #include "storage/sinvaladt.h" #include "storage/lmgr.h" -#include "utils/elog.h" #include "libpq/pqcomm.h" #include "catalog/catname.h" diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c index 86328bbd56e..53e98f3211f 100644 --- a/src/backend/utils/init/miscinit.c +++ b/src/backend/utils/init/miscinit.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.29 1999/05/25 16:12:35 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.30 1999/07/15 15:20:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,8 +25,6 @@ #include "utils/portal.h" /* for EnablePortalManager, etc. */ #include "utils/exc.h" /* for EnableExceptionHandling, etc. */ -#include "utils/mcxt.h" /* for EnableMemoryContext, etc. */ -#include "utils/elog.h" #include "utils/builtins.h" #include "miscadmin.h" /* where the declarations go */ diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index 0c2711483fb..6a304ec3d1f 100644 --- a/src/backend/utils/init/postinit.c +++ b/src/backend/utils/init/postinit.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.40 1999/05/25 16:12:36 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.41 1999/07/15 15:20:34 momjian Exp $ * * NOTES * InitPostgres() is the function called from PostgresMain @@ -60,9 +60,6 @@ #include "utils/exc.h" /* for EnableExceptionHandling, etc. */ #include "fmgr.h" /* for EnableDynamicFunctionManager, etc. */ -#include "utils/elog.h" -#include "utils/palloc.h" -#include "utils/mcxt.h" /* for EnableMemoryContext, etc. */ #include "utils/inval.h" #include "catalog/catname.h" diff --git a/src/backend/utils/misc/database.c b/src/backend/utils/misc/database.c index e9ea6193492..607dfcf46a3 100644 --- a/src/backend/utils/misc/database.c +++ b/src/backend/utils/misc/database.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.24 1999/05/25 16:12:47 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.25 1999/07/15 15:20:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,6 +20,7 @@ #include "postgres.h" #include "access/heapam.h" +#include "access/transam.h" #include "access/xact.h" #include "catalog/catname.h" #include "catalog/pg_database.h" diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c index 98cd5b6f161..8143bc2c3e7 100644 --- a/src/backend/utils/mmgr/mcxt.c +++ b/src/backend/utils/mmgr/mcxt.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/mcxt.c,v 1.14 1999/05/25 16:12:53 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/mcxt.c,v 1.15 1999/07/15 15:20:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,10 +22,7 @@ #include "nodes/memnodes.h" #include "nodes/nodes.h" -#include "utils/mcxt.h" -#include "utils/elog.h" -#include "utils/palloc.h" #undef MemoryContextAlloc #undef MemoryContextFree diff --git a/src/backend/utils/mmgr/palloc.c b/src/backend/utils/mmgr/palloc.c index bf36908973a..4eb27ccbc6f 100644 --- a/src/backend/utils/mmgr/palloc.c +++ b/src/backend/utils/mmgr/palloc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/palloc.c,v 1.12 1999/05/25 16:12:54 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/palloc.c,v 1.13 1999/07/15 15:20:38 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,9 +16,6 @@ #include "postgres.h" -#include "utils/mcxt.h" -#include "utils/elog.h" -#include "utils/palloc.h" #include "nodes/memnodes.h" diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c index 2c800e033c6..55512b1c950 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.23 1999/06/19 05:00:29 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.24 1999/07/15 15:20:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -81,7 +81,6 @@ #include "lib/hasht.h" #include "utils/module.h" #include "utils/excid.h" /* for Unimplemented */ -#include "utils/mcxt.h" #include "utils/hsearch.h" #include "nodes/memnodes.h" diff --git a/src/backend/utils/time/tqual.c b/src/backend/utils/time/tqual.c index 104e57b9194..b89706638a9 100644 --- a/src/backend/utils/time/tqual.c +++ b/src/backend/utils/time/tqual.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/time/tqual.c,v 1.29 1999/05/25 16:13:02 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/time/tqual.c,v 1.30 1999/07/15 15:20:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,8 +20,6 @@ #include "access/xact.h" #include "storage/bufmgr.h" #include "access/transam.h" -#include "utils/elog.h" -#include "utils/palloc.h" #include "utils/tqual.h" extern bool PostgresIsInitialized; |