More intelligent #include cleanups, as pointed out by Bryan...

Compiled with -Wall -Werror

diff --git a/src/backend/access/common/Makefile b/src/backend/access/common/Makefile
index 79fc06c..f09932d 100644 (file)
--- a/src/backend/access/common/Makefile
+++ b/src/backend/access/common/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for access/common
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.3 1996/10/31 07:22:07 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.4 1996/11/01 09:41:33 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,7 +14,7 @@ include ../../../Makefile.global
 INCLUDE_OPT = -I../../port/$(PORTNAME) \
               -I../../../include
 
-CFLAGS+=$(INCLUDE_OPT)
+CFLAGS+=$(INCLUDE_OPT) -Wall -Werror
 
 OBJS = heaptuple.o heapvalid.o indextuple.o indexvalid.o printtup.o \
        scankey.o tupdesc.o  

diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index 54edcde..55e5781 100644 (file)
--- a/src/backend/access/common/heaptuple.c
+++ b/src/backend/access/common/heaptuple.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.11 1996/11/01 09:12:18 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.12 1996/11/01 09:41:35 scrappy Exp $
  *
  * NOTES
  *    The old interface functions have been converted to macros
@@ -19,14 +19,14 @@
 
 #include "postgres.h"
 
-#include "utils/palloc.h"
-#include "storage/bufpage.h"
+#include "access/htup.h"
 #include "access/transam.h"
-#include "storage/buf.h"
-#include "access/tupmacs.h"
 #include "access/tupdesc.h"
+#include "access/tupmacs.h"
+#include "storage/buf.h"
+#include "storage/bufpage.h"
 #include "utils/memutils.h"
-#include "access/htup.h"
+#include "utils/palloc.h"
 
 #ifndef HAVE_MEMMOVE
 # include "regex/utils.h"

diff --git a/src/backend/access/common/heapvalid.c b/src/backend/access/common/heapvalid.c
index a60df78..a693b43 100644 (file)
--- a/src/backend/access/common/heapvalid.c
+++ b/src/backend/access/common/heapvalid.c
@@ -7,41 +7,26 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/Attic/heapvalid.c,v 1.8 1996/10/31 07:48:36 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/Attic/heapvalid.c,v 1.9 1996/11/01 09:41:37 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <time.h>
-
 #include "postgres.h"
+
+#include "access/htup.h"
+#include "utils/rel.h"
+#include "access/tupdesc.h"
+
 #include "fmgr.h"
-#include "access/attnum.h"
-#include "catalog/pg_am.h"
 #include "catalog/pg_attribute.h"
-#include "catalog/pg_class.h"
-#include "nodes/nodes.h"
-#include "nodes/pg_list.h"
-#include "storage/block.h"
 #include "storage/buf.h"
-#include "storage/fd.h"
 #include "storage/item.h"
 #include "storage/itemid.h"
-#include "storage/off.h"
 #include "storage/page.h"
-#include "utils/nabstime.h"
 
-#include "access/skey.h"
-#include "access/tupdesc.h"
 #include "access/xact.h"
-#include "rewrite/prs2lock.h"
 #include "storage/bufpage.h"
-#include "storage/itemptr.h"
-
-#include "access/strat.h"
-
-#include "access/htup.h"
-#include "utils/rel.h"
 
 #include "access/heaptuple.h"
 #include "utils/tqual.h"

diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c
index 9e52ad3..389e6ee 100644 (file)
--- a/src/backend/access/common/indextuple.c
+++ b/src/backend/access/common/indextuple.c
@@ -8,41 +8,27 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.7 1996/10/21 11:49:37 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.8 1996/11/01 09:41:37 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include <string.h>
-#include <time.h>
 
 #include "postgres.h"
-#include "access/attnum.h"
+#include "access/htup.h"
+#include "utils/rel.h"
+
 #include "access/tupmacs.h"
-#include "catalog/pg_am.h"
 #include "catalog/pg_attribute.h"
-#include "catalog/pg_class.h"
-#include "nodes/nodes.h"
-#include "nodes/pg_list.h"
-#include "storage/block.h"
 #include "storage/buf.h"
-#include "storage/fd.h"
-#include "storage/off.h"
 #include "utils/memutils.h"
-#include "utils/nabstime.h"
 #include "utils/palloc.h"
 
 #include "access/ibit.h"
-#include "access/skey.h"
 #include "access/tupdesc.h"
-#include "rewrite/prs2lock.h"
-#include "storage/itemptr.h"
-
-#include "access/strat.h"
 
 #include "access/itup.h"
-#include "access/htup.h"
-#include "utils/rel.h"
 
 #include "utils/tqual.h"
 

diff --git a/src/backend/access/common/indexvalid.c b/src/backend/access/common/indexvalid.c
index 4d5c700..4100e17 100644 (file)
--- a/src/backend/access/common/indexvalid.c
+++ b/src/backend/access/common/indexvalid.c
@@ -7,28 +7,20 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.8 1996/10/31 07:48:37 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.9 1996/11/01 09:41:38 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <time.h>
-
 #include "postgres.h"
-#include "access/attnum.h"
-#include "catalog/pg_attribute.h"
+
+#include "access/htup.h"
+#include "access/tupdesc.h"
+
 #include "executor/execdebug.h"
-#include "nodes/nodes.h"
-#include "nodes/pg_list.h"
-#include "storage/off.h"
-#include "storage/block.h"
-#include "utils/nabstime.h"
 
 #include "access/skey.h"
-#include "access/tupdesc.h"
-#include "storage/itemptr.h"
 
-#include "access/htup.h"
 #include "access/itup.h"
 
 

diff --git a/src/backend/access/common/printtup.c b/src/backend/access/common/printtup.c
index 2dcf1d4..9afff87 100644 (file)
--- a/src/backend/access/common/printtup.c
+++ b/src/backend/access/common/printtup.c
@@ -8,42 +8,27 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.6 1996/10/21 11:49:39 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.7 1996/11/01 09:41:39 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include <stdio.h>
 #include <sys/types.h>
-#include <time.h>
 #include <netinet/in.h>
 
 #include "postgres.h"
+
+#include "access/htup.h"
+#include "utils/rel.h"
+#include "access/tupdesc.h"
+
 #include "fmgr.h" 
-#include "access/attnum.h"
-#include "catalog/pg_am.h"
-#include "catalog/pg_attribute.h"
-#include "catalog/pg_class.h"
 #include "libpq/pqcomm.h"
-#include "nodes/nodes.h"
-#include "nodes/pg_list.h"
-#include "storage/block.h"
 #include "storage/buf.h"
-#include "storage/fd.h"
-#include "storage/off.h"
-#include "utils/nabstime.h"
 #include "utils/palloc.h"
 
 #include "libpq/libpq.h"
-#include "storage/itemptr.h"
-#include "access/tupdesc.h"
-#include "rewrite/prs2lock.h"
-#include "access/skey.h"
-
-#include "access/strat.h"
-
-#include "access/htup.h"
-#include "utils/rel.h"
 
 #include "catalog/pg_type.h"
 #include "utils/syscache.h"

diff --git a/src/backend/access/common/scankey.c b/src/backend/access/common/scankey.c
index 837f361..e4940a6 100644 (file)
--- a/src/backend/access/common/scankey.c
+++ b/src/backend/access/common/scankey.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.5 1996/10/21 11:49:40 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.6 1996/11/01 09:41:40 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,7 +19,6 @@
 
 #include "access/skey.h"
 
-
 /*
  * ScanKeyEntryIsLegal --
  *     True iff the scan key entry is legal.

diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c
index 5438bf2..c880954 100644 (file)
--- a/src/backend/access/common/tupdesc.c
+++ b/src/backend/access/common/tupdesc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.6 1996/10/31 07:48:38 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.7 1996/11/01 09:41:41 scrappy Exp $
  *
  * NOTES
  *    some of the executor utility code such as "ExecTypeFromTL" should be
@@ -21,30 +21,16 @@
 #include <time.h>
 
 #include "postgres.h"
+
+#include "access/htup.h"
+#include "utils/rel.h"
+#include "access/tupdesc.h"
+
 #include "utils/fcache.h"
-#include "access/attnum.h"
-#include "catalog/pg_am.h"
-#include "catalog/pg_attribute.h"
-#include "catalog/pg_class.h"
-#include "nodes/nodes.h"
-#include "nodes/pg_list.h"
-#include "storage/block.h"
-#include "storage/fd.h"
-#include "storage/off.h"
 #include "utils/geo-decls.h"
-#include "utils/nabstime.h"
 #include "utils/palloc.h"
 
 #include "nodes/primnodes.h"
-#include "access/tupdesc.h"
-#include "rewrite/prs2lock.h"
-#include "storage/itemptr.h"
-#include "access/skey.h"
-
-#include "access/strat.h"
-
-#include "access/htup.h"
-#include "utils/rel.h"
 
 #include "catalog/pg_type.h"
 #include "utils/builtins.h"