From 5a5f9420e5fbfd44e720b3bb08bd4fd3a6a1ee0d Mon Sep 17 00:00:00 2001 From: "Marc G. Fournier" Date: Mon, 4 Nov 1996 07:46:06 +0000 Subject: [PATCH] Another series started from utils/builtins.h --- src/include/access/skey.h | 5 ++--- src/include/access/strat.h | 4 ++-- src/include/access/tupdesc.h | 8 ++++---- src/include/rewrite/prs2lock.h | 6 +++--- src/include/storage/fd.h | 6 +----- src/include/utils/builtins.h | 13 +++++-------- src/include/utils/geo-decls.h | 3 +-- src/include/utils/rel.h | 14 +++++++------- 8 files changed, 25 insertions(+), 34 deletions(-) diff --git a/src/include/access/skey.h b/src/include/access/skey.h index f4af159b36..d392bfef0d 100644 --- a/src/include/access/skey.h +++ b/src/include/access/skey.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: skey.h,v 1.2 1996/10/19 04:36:08 scrappy Exp $ + * $Id: skey.h,v 1.3 1996/11/04 07:45:26 scrappy Exp $ * * * Note: @@ -16,8 +16,7 @@ #ifndef SKEY_H #define SKEY_H -#include "access/attnum.h" - +#include typedef struct ScanKeyData { bits16 sk_flags; /* flags */ diff --git a/src/include/access/strat.h b/src/include/access/strat.h index 7406074d3e..5cd23255ef 100644 --- a/src/include/access/strat.h +++ b/src/include/access/strat.h @@ -7,14 +7,14 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: strat.h,v 1.3 1996/11/01 09:30:41 scrappy Exp $ + * $Id: strat.h,v 1.4 1996/11/04 07:45:27 scrappy Exp $ * *------------------------------------------------------------------------- */ #ifndef STRAT_H #define STRAT_H -#include "access/skey.h" +#include typedef uint16 StrategyNumber; diff --git a/src/include/access/tupdesc.h b/src/include/access/tupdesc.h index 5323a734b9..34d57b70e9 100644 --- a/src/include/access/tupdesc.h +++ b/src/include/access/tupdesc.h @@ -6,16 +6,16 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: tupdesc.h,v 1.4 1996/11/01 09:22:33 scrappy Exp $ + * $Id: tupdesc.h,v 1.5 1996/11/04 07:45:28 scrappy Exp $ * *------------------------------------------------------------------------- */ #ifndef TUPDESC_H #define TUPDESC_H -#include "nodes/pg_list.h" -#include "catalog/pg_attribute.h" -#include "access/attnum.h" +#include +#include +#include typedef struct tupleDesc { /*------------------------------------------------------------------------ diff --git a/src/include/rewrite/prs2lock.h b/src/include/rewrite/prs2lock.h index b336ca8396..d7be60641a 100644 --- a/src/include/rewrite/prs2lock.h +++ b/src/include/rewrite/prs2lock.h @@ -5,15 +5,15 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: prs2lock.h,v 1.3 1996/11/01 09:30:54 scrappy Exp $ + * $Id: prs2lock.h,v 1.4 1996/11/04 07:45:46 scrappy Exp $ * *------------------------------------------------------------------------- */ #ifndef PRS2LOCK_H #define PRS2LOCK_H -#include "access/attnum.h" -#include "nodes/pg_list.h" +#include +#include /* * RewriteRule - diff --git a/src/include/storage/fd.h b/src/include/storage/fd.h index b19a135119..bb18cd02d4 100644 --- a/src/include/storage/fd.h +++ b/src/include/storage/fd.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: fd.h,v 1.3 1996/11/01 09:31:10 scrappy Exp $ + * $Id: fd.h,v 1.4 1996/11/04 07:45:53 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -37,19 +37,15 @@ /* * FileOpen uses the standard UNIX open(2) flags. */ -#include /* for O_ on most */ #ifndef O_RDONLY -#include /* for O_ on the rest */ #endif /* O_RDONLY */ /* * FileSeek uses the standard UNIX lseek(2) flags. */ #ifndef WIN32 -#include /* for SEEK_ on most */ #else #ifndef SEEK_SET -#include /* for SEEK_ on the rest */ #endif /* SEEK_SET */ #endif /* WIN32 */ diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h index 24491453be..3ebc076f2c 100644 --- a/src/include/utils/builtins.h +++ b/src/include/utils/builtins.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: builtins.h,v 1.4 1996/11/04 04:00:43 momjian Exp $ + * $Id: builtins.h,v 1.5 1996/11/04 07:46:00 scrappy Exp $ * * NOTES * This should normally only be included by fmgr.h. @@ -18,10 +18,10 @@ #ifndef BUILTINS_H #define BUILTINS_H -#include "storage/itemptr.h" -#include "utils/nabstime.h" -#include "utils/geo-decls.h" -#include "utils/rel.h" +#include +#include +#include +#include /* * Defined in adt/ @@ -228,7 +228,6 @@ extern POLYGON *rt_poly_inter(); extern int32 pqtest(struct varlena *vlena); /* arrayfuncs.c */ -#include "utils/array.h" /* date.c */ extern int32 reltimein(char *timestring); @@ -335,7 +334,6 @@ extern long float84gt(float64 arg1, float32 arg2); extern long float84ge(float64 arg1, float32 arg2); /* geo-ops.c, geo-selfuncs.c */ -#include "utils/geo-decls.h" /* misc.c */ extern bool NullValue(Datum value, bool *isNull); @@ -425,6 +423,5 @@ extern struct varlena *byteaSetByte(struct varlena *v, int32 n, int32 newByte); extern struct varlena *byteaSetBit(struct varlena *v, int32 n, int32 newBit); /* acl.c */ -#include "utils/acl.h" #endif /* BUILTINS_H */ diff --git a/src/include/utils/geo-decls.h b/src/include/utils/geo-decls.h index 5cf26925b6..c5be8b93ca 100644 --- a/src/include/utils/geo-decls.h +++ b/src/include/utils/geo-decls.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: geo-decls.h,v 1.2 1996/10/31 09:51:18 scrappy Exp $ + * $Id: geo-decls.h,v 1.3 1996/11/04 07:46:04 scrappy Exp $ * * NOTE * These routines do *not* use the float types from adt/. @@ -24,7 +24,6 @@ * Useful floating point utilities and constants. *-------------------------------------------------------------------*/ -#include #define EPSILON 1.0E-06 diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h index dbcd7e0f40..8ea8ed4b75 100644 --- a/src/include/utils/rel.h +++ b/src/include/utils/rel.h @@ -6,19 +6,19 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: rel.h,v 1.5 1996/11/01 09:31:17 scrappy Exp $ + * $Id: rel.h,v 1.6 1996/11/04 07:46:06 scrappy Exp $ * *------------------------------------------------------------------------- */ #ifndef REL_H #define REL_H -#include "access/strat.h" -#include "rewrite/prs2lock.h" -#include "access/tupdesc.h" -#include "catalog/pg_class.h" -#include "catalog/pg_am.h" -#include "storage/fd.h" +#include +#include +#include +#include +#include +#include typedef struct RelationData { File rd_fd; /* open file descriptor */