From 3516eda61c669945eec99fcd3bc8ccac4bb9829c Mon Sep 17 00:00:00 2001
From: "Marc G. Fournier" <scrappy@hub.org>
Date: Fri, 1 Nov 1996 09:31:17 +0000
Subject: [PATCH] Okay, following Bryan's (and others) suggestions...cleaning
up the include files properly...yet, slowly...
---
src/include/access/strat.h | 4 ++--
src/include/access/transam.h | 5 ++---
src/include/catalog/pg_class.h | 3 +--
src/include/rewrite/prs2lock.h | 5 +++--
src/include/storage/bufmgr.h | 3 ++-
src/include/storage/bufpage.h | 8 ++++----
src/include/storage/fd.h | 4 +---
src/include/storage/ipc.h | 4 +++-
src/include/utils/rel.h | 10 +++++-----
9 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/include/access/strat.h b/src/include/access/strat.h
index e1ab475b195..7406074d3ef 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.2 1996/10/19 04:05:44 scrappy Exp $
+ * $Id: strat.h,v 1.3 1996/11/01 09:30:41 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef STRAT_H
#define STRAT_H
-#include "access/skey.h"
+#include "access/skey.h"
typedef uint16 StrategyNumber;
diff --git a/src/include/access/transam.h b/src/include/access/transam.h
index 8cc0b4c4260..4acc8af5ce5 100644
--- a/src/include/access/transam.h
+++ b/src/include/access/transam.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: transam.h,v 1.2 1996/10/23 07:41:31 scrappy Exp $
+ * $Id: transam.h,v 1.3 1996/11/01 09:30:42 scrappy Exp $
*
* NOTES
* Transaction System Version 101 now support proper oid
@@ -17,9 +17,8 @@
#ifndef TRANSAM_H
#define TRANSAM_H
-#include "utils/nabstime.h"
-#include "utils/rel.h"
#include "storage/bufmgr.h"
+#include "utils/nabstime.h"
/* ----------------
* transaction system version id
diff --git a/src/include/catalog/pg_class.h b/src/include/catalog/pg_class.h
index d46357b7b67..8d48b9ab7df 100644
--- a/src/include/catalog/pg_class.h
+++ b/src/include/catalog/pg_class.h
@@ -7,7 +7,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pg_class.h,v 1.2 1996/10/31 09:47:21 scrappy Exp $
+ * $Id: pg_class.h,v 1.3 1996/11/01 09:30:46 scrappy Exp $
*
* NOTES
* ``pg_relation'' is being replaced by ``pg_class''. currently
@@ -29,7 +29,6 @@
* can be read by both genbki.sh and the C compiler.
* ----------------
*/
-#include "utils/nabstime.h"
/* ----------------
* pg_class definition. cpp turns this into
diff --git a/src/include/rewrite/prs2lock.h b/src/include/rewrite/prs2lock.h
index 398667bfa67..b336ca83967 100644
--- a/src/include/rewrite/prs2lock.h
+++ b/src/include/rewrite/prs2lock.h
@@ -5,14 +5,15 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: prs2lock.h,v 1.2 1996/10/19 04:25:53 scrappy Exp $
+ * $Id: prs2lock.h,v 1.3 1996/11/01 09:30:54 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef PRS2LOCK_H
#define PRS2LOCK_H
-#include "nodes/nodes.h"
+#include "access/attnum.h"
+#include "nodes/pg_list.h"
/*
* RewriteRule -
diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h
index a92fe0a65df..3d72f1f5037 100644
--- a/src/include/storage/bufmgr.h
+++ b/src/include/storage/bufmgr.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: bufmgr.h,v 1.4 1996/10/26 04:15:05 scrappy Exp $
+ * $Id: bufmgr.h,v 1.5 1996/11/01 09:31:05 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@@ -18,6 +18,7 @@
#include "storage/ipc.h"
#include "storage/buf.h"
#include "utils/rel.h"
+#include "storage/block.h"
/*
* the maximum size of a disk block for any possible installation.
diff --git a/src/include/storage/bufpage.h b/src/include/storage/bufpage.h
index de27959aa06..962b0290caa 100644
--- a/src/include/storage/bufpage.h
+++ b/src/include/storage/bufpage.h
@@ -6,18 +6,18 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: bufpage.h,v 1.5 1996/10/23 07:42:07 scrappy Exp $
+ * $Id: bufpage.h,v 1.6 1996/11/01 09:31:09 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef BUFPAGE_H
#define BUFPAGE_H
-#include "storage/itemid.h"
#include "storage/item.h"
-#include "storage/buf.h"
+#include "storage/off.h"
#include "storage/page.h"
-#include "storage/off.h"
+#include "storage/buf.h"
+#include "storage/itemid.h"
/*
* a postgres disk page is an abstraction layered on top of a postgres
diff --git a/src/include/storage/fd.h b/src/include/storage/fd.h
index 37381c746a5..b19a135119a 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.2 1996/10/31 09:49:45 scrappy Exp $
+ * $Id: fd.h,v 1.3 1996/11/01 09:31:10 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@@ -53,8 +53,6 @@
#endif /* SEEK_SET */
#endif /* WIN32 */
-#include "storage/block.h"
-
typedef char *FileName;
typedef int File;
diff --git a/src/include/storage/ipc.h b/src/include/storage/ipc.h
index 3d26e1483ff..bbe18a0fd59 100644
--- a/src/include/storage/ipc.h
+++ b/src/include/storage/ipc.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: ipc.h,v 1.7 1996/11/01 03:36:16 momjian Exp $
+ * $Id: ipc.h,v 1.8 1996/11/01 09:31:12 scrappy Exp $
*
* NOTES
* This file is very architecture-specific. This stuff should actually
@@ -21,6 +21,8 @@
#define _IPC_
#endif
+#include <sys/types.h>
+
/*
* Many architectures have support for user-level spinlocks (i.e., an
* atomic test-and-set instruction). However, we have only written
diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h
index 59ca8d4342a..dbcd7e0f403 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.4 1996/10/24 07:55:54 scrappy Exp $
+ * $Id: rel.h,v 1.5 1996/11/01 09:31:17 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef REL_H
#define REL_H
+#include "access/strat.h"
+#include "rewrite/prs2lock.h"
#include "access/tupdesc.h"
-#include "storage/fd.h"
-#include "catalog/pg_am.h"
#include "catalog/pg_class.h"
-#include "rewrite/prs2lock.h"
-#include "access/strat.h"
+#include "catalog/pg_am.h"
+#include "storage/fd.h"
typedef struct RelationData {
File rd_fd; /* open file descriptor */
--
GitLab