From d93d3c843af1eafb7cf6e0f79693a4cf3cc8a7af Mon Sep 17 00:00:00 2001 From: "Marc G. Fournier" Date: Mon, 4 Nov 1996 07:18:46 +0000 Subject: [PATCH] -Wall based cleanup of include files, based from acl.h, and everything that it depends on --- src/include/access/htup.h | 6 +++--- src/include/nodes/parsenodes.h | 6 +++--- src/include/nodes/pg_list.h | 4 ++-- src/include/nodes/primnodes.h | 8 ++++---- src/include/storage/itemptr.h | 6 +++--- src/include/utils/acl.h | 6 +++--- src/include/utils/array.h | 5 ++--- src/include/utils/fcache.h | 3 +-- src/include/utils/nabstime.h | 3 +-- src/include/utils/tqual.h | 4 ++-- 10 files changed, 24 insertions(+), 27 deletions(-) diff --git a/src/include/access/htup.h b/src/include/access/htup.h index 97ed8aeea7..2dedd873ea 100644 --- a/src/include/access/htup.h +++ b/src/include/access/htup.h @@ -6,15 +6,15 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: htup.h,v 1.2 1996/10/19 04:02:39 scrappy Exp $ + * $Id: htup.h,v 1.3 1996/11/04 07:18:11 scrappy Exp $ * *------------------------------------------------------------------------- */ #ifndef HTUP_H #define HTUP_H -#include "storage/itemptr.h" -#include "utils/nabstime.h" +#include +#include #define MinHeapTupleBitmapSize 32 /* 8 * 4 */ diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index b46a77ebe3..9e61aeffbc 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -6,15 +6,15 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parsenodes.h,v 1.5 1996/11/03 12:12:55 scrappy Exp $ + * $Id: parsenodes.h,v 1.6 1996/11/04 07:18:17 scrappy Exp $ * *------------------------------------------------------------------------- */ #ifndef PARSENODES_H #define PARSENODES_H -#include "utils/tqual.h" -#include "nodes/primnodes.h" +#include +#include /***************************************************************************** * Query Tree diff --git a/src/include/nodes/pg_list.h b/src/include/nodes/pg_list.h index 6c4d03b75a..d3bf7c0de9 100644 --- a/src/include/nodes/pg_list.h +++ b/src/include/nodes/pg_list.h @@ -6,14 +6,14 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_list.h,v 1.2 1996/10/19 03:58:29 scrappy Exp $ + * $Id: pg_list.h,v 1.3 1996/11/04 07:18:19 scrappy Exp $ * *------------------------------------------------------------------------- */ #ifndef PG_LIST_H #define PG_LIST_H -#include "nodes/nodes.h" +#include /* ---------------------------------------------------------------- * node definitions diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h index 41e98fbb5d..828a9d595a 100644 --- a/src/include/nodes/primnodes.h +++ b/src/include/nodes/primnodes.h @@ -6,16 +6,16 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: primnodes.h,v 1.5 1996/11/03 12:12:58 scrappy Exp $ + * $Id: primnodes.h,v 1.6 1996/11/04 07:18:21 scrappy Exp $ * *------------------------------------------------------------------------- */ #ifndef PRIMNODES_H #define PRIMNODES_H -#include "nodes/pg_list.h" -#include "access/attnum.h" -#include "utils/fcache.h" +#include +#include +#include /* ---------------------------------------------------------------- * node definitions diff --git a/src/include/storage/itemptr.h b/src/include/storage/itemptr.h index ec69153fbf..f794141a6e 100644 --- a/src/include/storage/itemptr.h +++ b/src/include/storage/itemptr.h @@ -6,15 +6,15 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: itemptr.h,v 1.3 1996/11/01 09:19:00 scrappy Exp $ + * $Id: itemptr.h,v 1.4 1996/11/04 07:18:29 scrappy Exp $ * *------------------------------------------------------------------------- */ #ifndef ITEMPTR_H #define ITEMPTR_H -#include "storage/block.h" -#include "storage/off.h" +#include +#include /* * ItemPointer: diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h index 66ef255fdd..e6e37af4cd 100644 --- a/src/include/utils/acl.h +++ b/src/include/utils/acl.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: acl.h,v 1.2 1996/10/31 09:51:05 scrappy Exp $ + * $Id: acl.h,v 1.3 1996/11/04 07:18:36 scrappy Exp $ * * NOTES * For backward-compatability purposes we have to allow there @@ -22,8 +22,8 @@ #ifndef ACL_H #define ACL_H -#include "utils/array.h" -#include "nodes/parsenodes.h" /* for ChangeACLStmt */ +#include +#include /* * AclId system identifier for the user, group, etc. diff --git a/src/include/utils/array.h b/src/include/utils/array.h index 8ab5b1370f..d27f89691e 100644 --- a/src/include/utils/array.h +++ b/src/include/utils/array.h @@ -10,7 +10,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: array.h,v 1.2 1996/11/04 04:00:36 momjian Exp $ + * $Id: array.h,v 1.3 1996/11/04 07:18:39 scrappy Exp $ * * NOTES * XXX the data array should be LONGALIGN'd -- notice that the array @@ -22,8 +22,7 @@ #ifndef ARRAY_H #define ARRAY_H -#include /* for FILE (XXX should use File) */ -#include "utils/memutils.h" +#include typedef struct { int size; /* total array size (in bytes) */ diff --git a/src/include/utils/fcache.h b/src/include/utils/fcache.h index 9802fdbfce..9ce6e857e9 100644 --- a/src/include/utils/fcache.h +++ b/src/include/utils/fcache.h @@ -6,14 +6,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: fcache.h,v 1.1 1996/08/28 01:58:57 scrappy Exp $ + * $Id: fcache.h,v 1.2 1996/11/04 07:18:42 scrappy Exp $ * *------------------------------------------------------------------------- */ #ifndef FCACHE_H #define FCACHE_H -#include "fmgr.h" typedef struct { diff --git a/src/include/utils/nabstime.h b/src/include/utils/nabstime.h index 168c6dce42..d5d34c8b9c 100644 --- a/src/include/utils/nabstime.h +++ b/src/include/utils/nabstime.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nabstime.h,v 1.3 1996/11/04 04:00:50 momjian Exp $ + * $Id: nabstime.h,v 1.4 1996/11/04 07:18:45 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -43,7 +43,6 @@ typedef TimeIntervalData *TimeInterval; * these integer constants depending on whether the constant is signed * or not! */ -#include /*#define NOSTART_ABSTIME ((AbsoluteTime) HIBITI) */ /* - 2^31 */ #define NOSTART_ABSTIME ((AbsoluteTime) INT_MIN) #else diff --git a/src/include/utils/tqual.h b/src/include/utils/tqual.h index 18586b7a62..dc8139266d 100644 --- a/src/include/utils/tqual.h +++ b/src/include/utils/tqual.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: tqual.h,v 1.4 1996/11/03 08:17:38 scrappy Exp $ + * $Id: tqual.h,v 1.5 1996/11/04 07:18:46 scrappy Exp $ * * NOTE * It may be desirable to allow time qualifications to indicate @@ -17,7 +17,7 @@ #ifndef TQUAL_H #define TQUAL_H -#include "access/htup.h" +#include typedef struct TimeQualSpace { char data[12];