diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index 35da114e31a8d15e0e9f33f07e22d34e123491ea..0603560b284af59fc8a179d9b744ea62b3e4ac51 100644
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@@ -7,11 +7,11 @@
* Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.62 1999/07/15 22:38:55 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.63 1999/07/16 03:12:46 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <unistd.h> /* For getopt() */
+#include <unistd.h>
#include <time.h>
#include <stdio.h>
#include <signal.h>
diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c
index 4f431fdfb48839dff1303e0f7b1d46c799c57582..c791c4ff2bf1de897e8aade1d8fe168702006cba 100644
--- a/src/backend/catalog/aclchk.c
+++ b/src/backend/catalog/aclchk.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.23 1999/07/15 22:38:57 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.24 1999/07/16 03:12:46 momjian Exp $
*
* NOTES
* See acl.h.
@@ -17,7 +17,7 @@
#include <string.h>
#include "postgres.h"
-#include "utils/acl.h" /* where declarations for this file go */
+#include "utils/acl.h"
#include "access/heapam.h"
#include "catalog/indexing.h"
#include "catalog/catalog.h"
diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c
index 02c2ee8ba0524f747aa958a592ef70b0c34cb4d6..6026254aaa7fe09caa6119c0cb463f7b2c109694 100644
--- a/src/backend/catalog/catalog.c
+++ b/src/backend/catalog/catalog.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.22 1999/07/15 23:03:04 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.23 1999/07/16 03:12:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,9 +15,9 @@
#include "postgres.h"
-#include <miscadmin.h> /* for DataDir */
+#include "miscadmin.h"
#include "utils/syscache.h"
-#include <catalog/catname.h> /* NameIs{,Shared}SystemRelationName */
+#include "catalog/catname.h"
#include "catalog/pg_type.h"
#include "catalog/catalog.h"
#include "access/transam.h"
diff --git a/src/backend/commands/_deadcode/recipe.c b/src/backend/commands/_deadcode/recipe.c
index 28d74f1aaf8894f351db9dbc51ea7f517afdf500..eba92e11e0ab908f6c92d80cade05d2ccb0ddd3c 100644
--- a/src/backend/commands/_deadcode/recipe.c
+++ b/src/backend/commands/_deadcode/recipe.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/recipe.c,v 1.5 1999/07/15 23:03:09 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/recipe.c,v 1.6 1999/07/16 03:12:49 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -22,7 +22,7 @@
#include "libpq/libpq-be.h"
#include "parser/parse_node.h"
#include "utils/builtins.h"
-#include <utils/relcache.h> /* for RelationNameGetRelation */
+#include "utils/relcache.h"
#include "rewrite/rewriteHandler.h"
#include "rewrite/rewriteManip.h"
#include "tcop/pquery.h"
diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c
index 29f9614244aa78a43286c2258bef0a916b6f7987..24e5e86cd57fa7a0add98b2cc6104c1cb1348be5 100644
--- a/src/backend/commands/async.c
+++ b/src/backend/commands/async.c
@@ -6,7 +6,7 @@
* Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.49 1999/07/15 23:03:06 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.50 1999/07/16 03:12:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -80,7 +80,7 @@
#include <signal.h>
#include <string.h>
#include <errno.h>
-#include <sys/types.h> /* Needed by in.h on Ultrix */
+#include <sys/types.h>
#include <netinet/in.h>
#include "postgres.h"
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index f3959bb403c46401cd013d20855690553d2fe253..8a2b92344ade0365591cbe8ace50e2f6f7a88d10 100644
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.36 1999/07/15 22:39:01 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.37 1999/07/16 03:12:48 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -22,7 +22,7 @@
#include "catalog/catname.h"
#include "catalog/pg_database.h"
#include "catalog/pg_shadow.h"
-#include "miscadmin.h" /* for DataDir */
+#include "miscadmin.h"
#include "tcop/tcopprot.h"
#include "commands/dbcommands.h"
#include "utils/syscache.h"
diff --git a/src/backend/commands/define.c b/src/backend/commands/define.c
index 2ed883f43134465124614e7008277b68ed851de7..298c6655692777ac647eafaaec5303e22d912b16 100644
--- a/src/backend/commands/define.c
+++ b/src/backend/commands/define.c
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.31 1999/07/15 23:03:08 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.32 1999/07/16 03:12:48 momjian Exp $
*
* DESCRIPTION
* The "DefineFoo" routines take the parse tree and pick out the
@@ -47,8 +47,8 @@
#include "catalog/pg_type.h"
#include "catalog/pg_language.h"
#include "utils/syscache.h"
-#include <fmgr.h> /* for fmgr */
-#include <utils/builtins.h> /* prototype for textin() */
+#include "fmgr.h"
+#include "utils/builtins.h"
#include "commands/defrem.h"
#include "tcop/dest.h"
#include "catalog/pg_shadow.h"
diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
index 9eeae0b3aa654b0b7b0869a5c9e8978f04480e00..7932bcf6d6c955185c934b77ec0b05f33ee37728 100644
--- a/src/backend/commands/indexcmds.c
+++ b/src/backend/commands/indexcmds.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.6 1999/07/15 23:03:08 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.7 1999/07/16 03:12:48 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -26,7 +26,7 @@
#include "catalog/pg_type.h"
#include "catalog/pg_opclass.h"
#include "commands/defrem.h"
-#include <parser/parsetree.h> /* for getrelid() */
+#include "parser/parsetree.h"
#include "optimizer/prep.h"
#include "optimizer/clauses.h"
diff --git a/src/backend/commands/rename.c b/src/backend/commands/rename.c
index 0064f4a22dff33de8bdb1cc4915f2ae9293b5302..c73dbe19a0c662ea4839828c247c3674e27b1a76 100644
--- a/src/backend/commands/rename.c
+++ b/src/backend/commands/rename.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.28 1999/07/15 23:03:08 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.29 1999/07/16 03:12:49 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -21,7 +21,7 @@
#include "catalog/catalog.h"
#include "commands/rename.h"
#include "miscadmin.h"
-#include <optimizer/prep.h> /* for find_all_inheritors */
+#include "optimizer/prep.h"
#ifndef NO_SECURITY
#include "utils/acl.h"
#endif /* !NO_SECURITY */
diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c
index 4423aeeea71383d36053618e43628d6fa6e1934a..0573d647ea5807a86e14796804662e5901bfdf95 100644
--- a/src/backend/executor/execAmi.c
+++ b/src/backend/executor/execAmi.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: execAmi.c,v 1.38 1999/07/15 22:39:04 momjian Exp $
+ * $Id: execAmi.c,v 1.39 1999/07/16 03:12:50 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -46,7 +46,7 @@
#include "executor/nodeAppend.h"
#include "executor/nodeSubplan.h"
#include "executor/execdebug.h"
-#include "optimizer/internal.h" /* for _NONAME_RELATION_ID_ */
+#include "optimizer/internal.h"
#include "access/genam.h"
#include "access/heapam.h"
#include "catalog/heap.h"
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index cd411a0ede986357e4955de576126353f194f473..8f1755356a2b9cb7c1bc51a52f06fa1abfbd662c 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -26,7 +26,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.90 1999/07/15 22:39:05 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.91 1999/07/16 03:12:50 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -40,7 +40,7 @@
#include "utils/builtins.h"
#include "utils/acl.h"
#include "utils/syscache.h"
-#include "parser/parsetree.h" /* rt_fetch() */
+#include "parser/parsetree.h"
/* #include "access/localam.h" */
#include "optimizer/var.h"
#include "access/heapam.h"
diff --git a/src/backend/executor/nodeAppend.c b/src/backend/executor/nodeAppend.c
index c51b92bf4f9a39793c237bc520feba105aa833f7..d32ef038719b21d9252916a6b38f98a706c5dae8 100644
--- a/src/backend/executor/nodeAppend.c
+++ b/src/backend/executor/nodeAppend.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.21 1999/07/15 22:39:07 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.22 1999/07/16 03:12:52 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -60,7 +60,7 @@
#include "executor/executor.h"
#include "executor/execdebug.h"
#include "executor/nodeAppend.h"
-#include "parser/parsetree.h" /* for rt_store() macro */
+#include "parser/parsetree.h"
static bool exec_append_initialize_next(Append *node);
diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c
index 4796e118af2d2fd787b4a27619420584f43639ea..39a0d65c7929d45a87c47729dec273583baaa840 100644
--- a/src/backend/executor/nodeHashjoin.c
+++ b/src/backend/executor/nodeHashjoin.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeHashjoin.c,v 1.23 1999/07/15 22:39:09 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeHashjoin.c,v 1.24 1999/07/16 03:12:52 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -19,7 +19,7 @@
#include "executor/executor.h"
#include "executor/nodeHash.h"
#include "executor/nodeHashjoin.h"
-#include "optimizer/clauses.h" /* for get_leftop */
+#include "optimizer/clauses.h"
static TupleTableSlot *ExecHashJoinOuterGetTuple(Plan *node, Plan *parent,
HashJoinState *hjstate);
diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c
index ade2a9130261fd571dd813971c68a7fb58d3ee6a..f92acd97b333e1d5e8031eb7b3e8bba580a0359f 100644
--- a/src/backend/executor/nodeIndexscan.c
+++ b/src/backend/executor/nodeIndexscan.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.38 1999/07/15 22:39:09 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.39 1999/07/16 03:12:53 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -34,8 +34,8 @@
#include "executor/execdebug.h"
#include "executor/nodeIndexscan.h"
-#include "optimizer/clauses.h" /* for get_op, get_leftop, get_rightop */
-#include "parser/parsetree.h" /* for rt_fetch() */
+#include "optimizer/clauses.h"
+#include "parser/parsetree.h"
#include "access/heapam.h"
#include "access/genam.h"
diff --git a/src/backend/executor/nodeMaterial.c b/src/backend/executor/nodeMaterial.c
index 485b527cbeeaa47d8492099e2ff27bcd414bdfbe..e99fb9d762de1714e18575eb0ca0857b92ef74f2 100644
--- a/src/backend/executor/nodeMaterial.c
+++ b/src/backend/executor/nodeMaterial.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeMaterial.c,v 1.23 1999/07/15 22:39:10 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeMaterial.c,v 1.24 1999/07/16 03:12:53 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -24,7 +24,7 @@
#include "executor/executor.h"
#include "executor/nodeMaterial.h"
#include "catalog/heap.h"
-#include "optimizer/internal.h" /* for _NONAME_RELATION_ID_ */
+#include "optimizer/internal.h"
#include "access/heapam.h"
/* ----------------------------------------------------------------
diff --git a/src/backend/executor/nodeUnique.c b/src/backend/executor/nodeUnique.c
index 3693489a0d7d9605c5f5eff4a3d6e6c6b0065daf..1fd6644058f8a983e26f81bd55cd7f5cb4dc56d2 100644
--- a/src/backend/executor/nodeUnique.c
+++ b/src/backend/executor/nodeUnique.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeUnique.c,v 1.21 1999/07/15 22:39:11 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeUnique.c,v 1.22 1999/07/16 03:12:54 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -29,7 +29,7 @@
#include "executor/executor.h"
#include "executor/nodeUnique.h"
#include "access/heapam.h"
-#include "access/printtup.h" /* for getTypeOutAndElem() */
+#include "access/printtup.h"
/* ----------------------------------------------------------------
* ExecIdenticalTuples
diff --git a/src/backend/libpq/be-fsstubs.c b/src/backend/libpq/be-fsstubs.c
index eecb1331378e6f399eaf26b50a5802abb2a2e456..1ad0dbf92afa0744a94956b643d0d3ad1a42f51b 100644
--- a/src/backend/libpq/be-fsstubs.c
+++ b/src/backend/libpq/be-fsstubs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.38 1999/07/15 23:03:13 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.39 1999/07/16 03:12:55 momjian Exp $
*
* NOTES
* This should be moved to a more appropriate place. It is here
@@ -38,7 +38,7 @@
#include "postgres.h"
#include "libpq/libpq-fs.h"
-#include <catalog/pg_shadow.h> /* for superuser() */
+#include "catalog/pg_shadow.h"
#include "storage/large_object.h"
#include "libpq/be-fsstubs.h"
diff --git a/src/backend/libpq/portal.c b/src/backend/libpq/portal.c
index 9680909c3031126614286fb1b6e4a5ccb9f1e4a1..eef88b37e42c3eb4cfe6e520f25e89987e1fa46d 100644
--- a/src/backend/libpq/portal.c
+++ b/src/backend/libpq/portal.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: portal.c,v 1.24 1999/07/15 23:03:14 momjian Exp $
+ * $Id: portal.c,v 1.25 1999/07/16 03:12:56 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -55,7 +55,7 @@
#include "postgres.h"
-#include <libpq/libpq.h> /* where the declarations go */
+#include "libpq/libpq.h"
/* ----------------------------------------------------------------
diff --git a/src/backend/libpq/portalbuf.c b/src/backend/libpq/portalbuf.c
index c2b84ab2fa2866614c9a29c902768a859201ef7a..2bdae5963197a8ae9d128a253c2717b28df56e4d 100644
--- a/src/backend/libpq/portalbuf.c
+++ b/src/backend/libpq/portalbuf.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.18 1999/07/15 23:03:14 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.19 1999/07/16 03:12:56 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -52,7 +52,7 @@
#include "postgres.h"
-#include <libpq/libpq.h> /* where the declarations go */
+#include "libpq/libpq.h"
PortalEntry **portals = (PortalEntry **) NULL;
size_t portals_array_size = 0;
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index 5bff53e54f3e83ee2e78bae54f6bf1945d4868d8..4a875bfbffafa08f623141ef91a983211dc0a31f 100644
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -28,7 +28,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pqcomm.c,v 1.74 1999/07/15 22:39:15 momjian Exp $
+ * $Id: pqcomm.c,v 1.75 1999/07/16 03:12:57 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -69,7 +69,7 @@
#include <signal.h>
#include <errno.h>
#include <fcntl.h>
-#include <unistd.h> /* for ttyname() */
+#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/socket.h>
@@ -79,7 +79,7 @@
#include <arpa/inet.h>
#include <sys/file.h>
-#include "libpq/libpq.h" /* where my declarations go */
+#include "libpq/libpq.h"
#include "miscadmin.h"
#ifndef SOMAXCONN
diff --git a/src/backend/libpq/util.c b/src/backend/libpq/util.c
index 72c475d375c09c1942f068ddc3e78ec21bfa4222..3d9ba30b496d12536178aa35a85e616b85e3fd02 100644
--- a/src/backend/libpq/util.c
+++ b/src/backend/libpq/util.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: util.c,v 1.11 1999/07/15 23:03:14 momjian Exp $
+ * $Id: util.c,v 1.12 1999/07/16 03:12:57 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -21,7 +21,7 @@
#include <string.h>
#include "postgres.h"
-#include <libpq/libpq.h> /* where the declarations go */
+#include "libpq/libpq.h"
/* ----------------
diff --git a/src/backend/main/main.c b/src/backend/main/main.c
index a20268229b03068d05a53645a4888308c3e1766b..77b6bc035b14692e84bbf2e5b5b82cd5bda7749c 100644
--- a/src/backend/main/main.c
+++ b/src/backend/main/main.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.25 1999/07/15 23:03:15 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.26 1999/07/16 03:12:58 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -27,8 +27,8 @@
#include <locale.h>
#endif
#include "miscadmin.h"
-#include "bootstrap/bootstrap.h"/* for BootstrapMain() */
-#include "tcop/tcopprot.h" /* for PostgresMain() */
+#include "bootstrap/bootstrap.h"
+#include "tcop/tcopprot.h"
#define NOROOTEXEC "\
\n\"root\" execution of the PostgreSQL backend is not permitted.\n\n\
diff --git a/src/backend/optimizer/path/_deadcode/xfunc.c b/src/backend/optimizer/path/_deadcode/xfunc.c
index 2921372d6c54544dd7ddd15ab1c8c80b1e19181c..fbf07e1cf8e801c20e95078c25dd605f1f5c36d2 100644
--- a/src/backend/optimizer/path/_deadcode/xfunc.c
+++ b/src/backend/optimizer/path/_deadcode/xfunc.c
@@ -9,13 +9,13 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/xfunc.c,v 1.6 1999/07/15 15:19:19 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/xfunc.c,v 1.7 1999/07/16 03:13:02 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <math.h> /* for MAXFLOAT on most systems */
+#include <math.h>
-#include <values.h> /* for MAXFLOAT on SunOS */
+#include <values.h>
#include <string.h>
#include "postgres.h"
@@ -35,8 +35,8 @@
#include "optimizer/internal.h"
#include "optimizer/keys.h"
#include "optimizer/pathnode.h"
-#include "optimizer/tlist.h" /* for get_expr */
-#include "storage/buf_internals.h" /* for NBuffers */
+#include "optimizer/tlist.h"
+#include "storage/buf_internals.h"
#include "tcop/dest.h"
#include "utils/syscache.h"
diff --git a/src/backend/optimizer/path/clausesel.c b/src/backend/optimizer/path/clausesel.c
index aa70ca3a3be07152ea9e209e7b64f645b14e5f71..ea218b14940977bb120f9cd5501074eb0b58f932 100644
--- a/src/backend/optimizer/path/clausesel.c
+++ b/src/backend/optimizer/path/clausesel.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.21 1999/07/15 22:39:22 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.22 1999/07/16 03:12:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -19,7 +19,7 @@
#include "optimizer/cost.h"
#include "optimizer/internal.h"
#include "optimizer/plancat.h"
-#include "parser/parsetree.h" /* for getrelid() */
+#include "parser/parsetree.h"
#include "utils/lsyscache.h"
diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c
index aef2fcd3dffe444af451e70c1999a45633cde115..d6510c4212dff6761cebb15e7482c156afd04a45 100644
--- a/src/backend/optimizer/path/indxpath.c
+++ b/src/backend/optimizer/path/indxpath.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.59 1999/07/15 22:39:23 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.60 1999/07/16 03:13:00 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -31,10 +31,10 @@
#include "optimizer/paths.h"
#include "optimizer/plancat.h"
#include "optimizer/pathnode.h"
-#include "parser/parsetree.h" /* for getrelid() */
-#include "parser/parse_expr.h" /* for exprType() */
-#include "parser/parse_oper.h" /* for oprid() and oper() */
-#include "parser/parse_coerce.h"/* for IS_BINARY_COMPATIBLE() */
+#include "parser/parsetree.h"
+#include "parser/parse_expr.h"
+#include "parser/parse_oper.h"
+#include "parser/parse_coerce.h"
#include "utils/lsyscache.h"
diff --git a/src/backend/optimizer/path/joinpath.c b/src/backend/optimizer/path/joinpath.c
index 51faaf228f5e1746badeff2b551c3e7addfffb5b..f0ad8162715e1150bb96d6f4b19aa574ca7324b6 100644
--- a/src/backend/optimizer/path/joinpath.c
+++ b/src/backend/optimizer/path/joinpath.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.39 1999/07/15 22:39:24 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.40 1999/07/16 03:13:00 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -20,8 +20,7 @@
#include "optimizer/paths.h"
#include "optimizer/pathnode.h"
-#include "optimizer/cost.h" /* for _enable_{hashjoin,
- * _enable_mergejoin} */
+#include "optimizer/cost.h"
static Path *best_innerjoin(List *join_paths, List *outer_relid);
static List *sort_inner_and_outer(RelOptInfo *joinrel, RelOptInfo *outerrel, RelOptInfo *innerrel,
diff --git a/src/backend/optimizer/prep/preptlist.c b/src/backend/optimizer/prep/preptlist.c
index f3a16dcb734d81d849e9c55ca599c309f4ab7d61..a9635368c81e6a4592ac43637a94ff2f629403e2 100644
--- a/src/backend/optimizer/prep/preptlist.c
+++ b/src/backend/optimizer/prep/preptlist.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/preptlist.c,v 1.24 1999/07/15 22:39:29 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/preptlist.c,v 1.25 1999/07/16 03:13:03 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -21,7 +21,7 @@
#include "utils/syscache.h"
#include "utils/lsyscache.h"
-#include "parser/parsetree.h" /* for getrelid() */
+#include "parser/parsetree.h"
#include "optimizer/prep.h"
#include "optimizer/clauses.h"
diff --git a/src/backend/optimizer/util/indexnode.c b/src/backend/optimizer/util/indexnode.c
index 7ae1790278954ce13b609ba0a3c4a637e691445a..65e1e5fed1f9f69655a03788ba107f14ff505f71 100644
--- a/src/backend/optimizer/util/indexnode.c
+++ b/src/backend/optimizer/util/indexnode.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/indexnode.c,v 1.17 1999/07/15 22:39:30 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/indexnode.c,v 1.18 1999/07/16 03:13:04 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -17,7 +17,7 @@
#include "optimizer/plancat.h"
-#include "optimizer/pathnode.h" /* where the decls go */
+#include "optimizer/pathnode.h"
static List *find_secondary_index(Query *root, Oid relid);
diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c
index 10283aa25047097235a8f619b5d628915daad701..c7a1e8f58a7d0437612e0c96359adca7456f26b8 100644
--- a/src/backend/optimizer/util/pathnode.c
+++ b/src/backend/optimizer/util/pathnode.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.44 1999/07/15 22:39:31 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.45 1999/07/16 03:13:04 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -23,7 +23,7 @@
#include "optimizer/keys.h"
#include "optimizer/ordering.h"
-#include "parser/parsetree.h" /* for getrelid() */
+#include "parser/parsetree.h"
static Path *better_path(Path *new_path, List *unique_paths, bool *is_new);
diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c
index 0d7c91556f3548f33e2a12ed42190bec013f5397..0e42f1d9254cd59d3c97989057c91c33505e0196 100644
--- a/src/backend/optimizer/util/plancat.c
+++ b/src/backend/optimizer/util/plancat.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.32 1999/07/15 22:39:32 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.33 1999/07/16 03:13:05 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -23,7 +23,7 @@
#include "catalog/pg_amop.h"
#include "catalog/pg_inherits.h"
-#include "parser/parsetree.h" /* for getrelid() */
+#include "parser/parsetree.h"
#include "optimizer/internal.h"
#include "optimizer/plancat.h"
diff --git a/src/backend/optimizer/util/relnode.c b/src/backend/optimizer/util/relnode.c
index 19dadd771751bb870d2203263886051484971b12..2a1b4cc73bd87685a99c78f0b1146a6530ab18f6 100644
--- a/src/backend/optimizer/util/relnode.c
+++ b/src/backend/optimizer/util/relnode.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/relnode.c,v 1.17 1999/07/15 22:39:32 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/relnode.c,v 1.18 1999/07/16 03:13:05 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,7 +15,7 @@
#include "optimizer/internal.h"
-#include "optimizer/pathnode.h" /* where the decls go */
+#include "optimizer/pathnode.h"
#include "optimizer/plancat.h"
diff --git a/src/backend/port/dynloader/bsd.h b/src/backend/port/dynloader/bsd.h
index b4ac086c92ff097a1302e06cdfa8d0098a33c6d1..d947242e3a51aaecf69e110c0f963887e625800a 100644
--- a/src/backend/port/dynloader/bsd.h
+++ b/src/backend/port/dynloader/bsd.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: bsd.h,v 1.4 1999/07/15 23:03:19 momjian Exp $
+ * $Id: bsd.h,v 1.5 1999/07/16 03:13:09 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -19,7 +19,7 @@
#include "postgres.h"
-#include "fmgr.h" /* for func_ptr */
+#include "fmgr.h"
#include "utils/dynamic_loader.h"
/* dynloader.c */
diff --git a/src/backend/port/dynloader/bsdi.h b/src/backend/port/dynloader/bsdi.h
index 19a5fccc64ad7ee58089ccdaeb12dce706bdee95..a9b01fce22dec38f89cc6c1e4b0da159b3f57634 100644
--- a/src/backend/port/dynloader/bsdi.h
+++ b/src/backend/port/dynloader/bsdi.h
@@ -13,7 +13,7 @@
#ifndef PORT_PROTOS_H
#define PORT_PROTOS_H
-#include "fmgr.h" /* for func_ptr */
+#include "fmgr.h"
#include "utils/dynamic_loader.h"
/* dynloader.c */
diff --git a/src/backend/port/dynloader/dgux.h b/src/backend/port/dynloader/dgux.h
index 604e18709c63e2c614947fba47cf27c6cd36dc40..c483007fbce3bdf26feb7f807bc7033ff314887f 100644
--- a/src/backend/port/dynloader/dgux.h
+++ b/src/backend/port/dynloader/dgux.h
@@ -4,7 +4,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: dgux.h,v 1.5 1999/02/13 23:17:19 momjian Exp $
+ * $Id: dgux.h,v 1.6 1999/07/16 03:13:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -12,7 +12,7 @@
#define PORT_PROTOS_H
#include <dlfcn.h>
-#include "fmgr.h" /* for func_ptr */
+#include "fmgr.h"
#include "utils/dynamic_loader.h"
/*
diff --git a/src/backend/port/dynloader/freebsd.h b/src/backend/port/dynloader/freebsd.h
index f0c01ae955eaa79f7c3e59b6d74ca6f23796eb0a..782a0230a346360a0ff886d86b9fd7863fa95b0d 100644
--- a/src/backend/port/dynloader/freebsd.h
+++ b/src/backend/port/dynloader/freebsd.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: freebsd.h,v 1.3 1999/07/15 23:03:20 momjian Exp $
+ * $Id: freebsd.h,v 1.4 1999/07/16 03:13:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -19,7 +19,7 @@
#include "postgres.h"
-#include "fmgr.h" /* for func_ptr */
+#include "fmgr.h"
#include "utils/dynamic_loader.h"
/* dynloader.c */
diff --git a/src/backend/port/dynloader/hpux.c b/src/backend/port/dynloader/hpux.c
index f9998b42964ca343d77dba99e275a3ff4fb8b0d5..742b8c8e69761774b67ce53f5921cca9f117aae2 100644
--- a/src/backend/port/dynloader/hpux.c
+++ b/src/backend/port/dynloader/hpux.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/port/dynloader/hpux.c,v 1.8 1999/07/15 23:03:20 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/port/dynloader/hpux.c,v 1.9 1999/07/16 03:13:11 momjian Exp $
*
* NOTES
* all functions are defined here -- it's impossible to trace the
@@ -20,9 +20,9 @@
#include <a.out.h>
#include "dl.h"
#include "postgres.h"
+#include "dynloader.h"
#include "fmgr.h"
#include "utils/dynamic_loader.h"
-#include "dynloader.h"
void *
pg_dlopen(char *filename)
diff --git a/src/backend/port/dynloader/irix5.h b/src/backend/port/dynloader/irix5.h
index 020aa0d88f9611bbc3ee0640f9af49e0e171d3c3..654f8d8e914b90026f227a125dfaeca5382ca2d5 100644
--- a/src/backend/port/dynloader/irix5.h
+++ b/src/backend/port/dynloader/irix5.h
@@ -14,7 +14,7 @@
#define PORT_PROTOS_H
#include <dlfcn.h>
-#include "fmgr.h" /* for func_ptr */
+#include "fmgr.h"
#include "utils/dynamic_loader.h"
/* dynloader.c */
diff --git a/src/backend/port/dynloader/linux.h b/src/backend/port/dynloader/linux.h
index 6536efce36bf135efab80fa1de6f08e473003d05..dd6112f1a72cf5d2b18860befa1b0bab35cc9201 100644
--- a/src/backend/port/dynloader/linux.h
+++ b/src/backend/port/dynloader/linux.h
@@ -6,14 +6,14 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: linux.h,v 1.6 1999/07/15 23:03:20 momjian Exp $
+ * $Id: linux.h,v 1.7 1999/07/16 03:13:12 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef PORT_PROTOS_H
#define PORT_PROTOS_H
-#include "fmgr.h" /* for func_ptr */
+#include "fmgr.h"
#include "utils/dynamic_loader.h"
#ifdef __ELF__
#include <dlfcn.h>
diff --git a/src/backend/port/dynloader/nextstep.h b/src/backend/port/dynloader/nextstep.h
index 6867aca294dbaab3e110f1a49f41ff11a4c7f712..dfbbdfaef9fcd6edd8dac9d61a009f7600bf080f 100644
--- a/src/backend/port/dynloader/nextstep.h
+++ b/src/backend/port/dynloader/nextstep.h
@@ -9,7 +9,7 @@
#ifndef PORT_PROTOS_H
#define PORT_PROTOS_H
-#include "fmgr.h" /* for func_ptr */
+#include "fmgr.h"
#include "utils/dynamic_loader.h"
void *next_dlopen(char *name);
diff --git a/src/backend/port/dynloader/sco.h b/src/backend/port/dynloader/sco.h
index 803158201b6fbcded8c10245f87a324ec05ebcce..efe89d35c201f337fae5313e1fddf80d306e7934 100644
--- a/src/backend/port/dynloader/sco.h
+++ b/src/backend/port/dynloader/sco.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: sco.h,v 1.3 1999/02/13 23:17:25 momjian Exp $
+ * $Id: sco.h,v 1.4 1999/07/16 03:13:13 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -14,7 +14,7 @@
#define PORT_PROTOS_H
#include <dlfcn.h>
-#include "fmgr.h" /* for func_ptr */
+#include "fmgr.h"
#include "utils/dynamic_loader.h"
/* dynloader.c */
diff --git a/src/backend/port/dynloader/solaris_i386.h b/src/backend/port/dynloader/solaris_i386.h
index 803647af79f25eb805efd5796e9e10402536eab5..20b0909698f58ee6544a2bb2bc921d7a915da0cc 100755
--- a/src/backend/port/dynloader/solaris_i386.h
+++ b/src/backend/port/dynloader/solaris_i386.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: solaris_i386.h,v 1.3 1999/02/13 23:17:25 momjian Exp $
+ * $Id: solaris_i386.h,v 1.4 1999/07/16 03:13:13 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -14,7 +14,7 @@
#define PORT_PROTOS_H
#include <dlfcn.h>
-#include "fmgr.h" /* for func_ptr */
+#include "fmgr.h"
#include "utils/dynamic_loader.h"
/* dynloader.c */
diff --git a/src/backend/port/dynloader/solaris_sparc.h b/src/backend/port/dynloader/solaris_sparc.h
index 543f5f940b86d5d2f59b924b2c7d47146c142f3d..3a896866b1aa25e934ab133942a5dd586588e0d6 100755
--- a/src/backend/port/dynloader/solaris_sparc.h
+++ b/src/backend/port/dynloader/solaris_sparc.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: solaris_sparc.h,v 1.3 1999/02/13 23:17:26 momjian Exp $
+ * $Id: solaris_sparc.h,v 1.4 1999/07/16 03:13:14 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -18,7 +18,7 @@
#include <dlfcn.h>
-#include "fmgr.h" /* for func_ptr */
+#include "fmgr.h"
#include "utils/dynamic_loader.h"
/* dynloader.c */
diff --git a/src/backend/port/dynloader/sunos4.h b/src/backend/port/dynloader/sunos4.h
index c9c7960656eae2538ca65a6df15db3bd5409d6fe..8fa8b8a6644804c44004329f1f49e2fb57ee9cf7 100644
--- a/src/backend/port/dynloader/sunos4.h
+++ b/src/backend/port/dynloader/sunos4.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: sunos4.h,v 1.3 1999/02/13 23:17:27 momjian Exp $
+ * $Id: sunos4.h,v 1.4 1999/07/16 03:13:14 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -14,7 +14,7 @@
#define PORT_PROTOS_H
#include <dlfcn.h>
-#include "fmgr.h" /* for func_ptr */
+#include "fmgr.h"
#include "utils/dynamic_loader.h"
/* dynloader.c */
diff --git a/src/backend/port/dynloader/svr4.h b/src/backend/port/dynloader/svr4.h
index b4c96a05d638b636cba48a62703e67b9f9621e4f..e374fc53b1edc35c1186cfbb9a65d2ec80987be0 100644
--- a/src/backend/port/dynloader/svr4.h
+++ b/src/backend/port/dynloader/svr4.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: svr4.h,v 1.3 1999/02/13 23:17:27 momjian Exp $
+ * $Id: svr4.h,v 1.4 1999/07/16 03:13:15 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -14,7 +14,7 @@
#define DYNLOADER_H
#include <dlfcn.h>
-#include "fmgr.h" /* for func_ptr */
+#include "fmgr.h"
#include "utils/dynamic_loader.h"
/* dynloader.h */
diff --git a/src/backend/port/dynloader/ultrix4.h b/src/backend/port/dynloader/ultrix4.h
index 826f3ada06a6e4afb261fe31232aeb9448f183d6..e7f719e63d46e966dd8dede46cf55d0f1107f6d4 100644
--- a/src/backend/port/dynloader/ultrix4.h
+++ b/src/backend/port/dynloader/ultrix4.h
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: ultrix4.h,v 1.4 1999/07/15 23:03:21 momjian Exp $
+ * $Id: ultrix4.h,v 1.5 1999/07/16 03:13:15 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -34,7 +34,7 @@
#ifndef _DL_HEADER_
#define _DL_HEADER_
-#include <stdio.h> /* needed to declare FILE for ldfcn.h */
+#include <stdio.h>
#include "filehdr.h"
#include "syms.h"
#include "ldfcn.h"
diff --git a/src/backend/port/dynloader/univel.h b/src/backend/port/dynloader/univel.h
index 9b047448bcfaf7663ad64722090565311388b5f6..e85c6a4c08dbf2f98815546428d723b6c87f7c95 100644
--- a/src/backend/port/dynloader/univel.h
+++ b/src/backend/port/dynloader/univel.h
@@ -14,7 +14,7 @@
#define PORT_PROTOS_H
#include <dlfcn.h>
-#include "fmgr.h" /* for func_ptr */
+#include "fmgr.h"
#include "utils/dynamic_loader.h"
/* dynloader.c */
diff --git a/src/backend/port/dynloader/unixware.h b/src/backend/port/dynloader/unixware.h
index 25470fb2c5e2028a6913bc71c98f7ad842b201dd..5e00a5c4a17e0ed338c9401b1c15db684dd832a7 100644
--- a/src/backend/port/dynloader/unixware.h
+++ b/src/backend/port/dynloader/unixware.h
@@ -14,7 +14,7 @@
#define PORT_PROTOS_H
#include <dlfcn.h>
-#include "fmgr.h" /* for func_ptr */
+#include "fmgr.h"
#include "utils/dynamic_loader.h"
/* dynloader.c */
diff --git a/src/backend/port/dynloader/win.h b/src/backend/port/dynloader/win.h
index 4f83b14ccf7c78013063bec10259c6fc3aa33a2e..c736935454460535e4ba146c65b7e1801d367383 100644
--- a/src/backend/port/dynloader/win.h
+++ b/src/backend/port/dynloader/win.h
@@ -14,7 +14,7 @@
#define PORT_PROTOS_H
#include <dlfcn.h>
-#include "fmgr.h" /* for func_ptr */
+#include "fmgr.h"
#include "utils/dynamic_loader.h"
/* dynloader.c */
diff --git a/src/backend/port/hpux/port-protos.h b/src/backend/port/hpux/port-protos.h
index 2bfa0a27324ebdd937cabc153625252694a9c17f..3d1193810dba2d697887c27f7f008186ab6c4c9c 100644
--- a/src/backend/port/hpux/port-protos.h
+++ b/src/backend/port/hpux/port-protos.h
@@ -6,15 +6,15 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: port-protos.h,v 1.7 1999/02/13 23:17:34 momjian Exp $
+ * $Id: port-protos.h,v 1.8 1999/07/16 03:13:18 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#ifndef PORT_PROTOS_H
#define PORT_PROTOS_H
-#include <sys/resource.h> /* for struct rusage */
-#include <dl.h> /* for shl_t */
+#include <sys/resource.h>
+#include "dl.h"
#include "utils/dynamic_loader.h"
diff --git a/src/backend/port/random.c b/src/backend/port/random.c
index a14dee96ca888e7d9109d1c2e1fdd09b91feb205..7b523b486746f3f5afdf4688f1ccc4c79b593b84 100644
--- a/src/backend/port/random.c
+++ b/src/backend/port/random.c
@@ -1,7 +1,7 @@
-/* $Id: random.c,v 1.7 1999/07/15 15:19:33 momjian Exp $ */
+/* $Id: random.c,v 1.8 1999/07/16 03:13:06 momjian Exp $ */
#include <stdlib.h>
-#include <math.h> /* for pow() prototype */
+#include <math.h>
#include <errno.h>
long
diff --git a/src/backend/port/srandom.c b/src/backend/port/srandom.c
index b1034f0279067af1387307879e41436b39d2592d..f7ff333f2e1305831134c9c7055e30c80768f20b 100644
--- a/src/backend/port/srandom.c
+++ b/src/backend/port/srandom.c
@@ -1,7 +1,7 @@
-/* $Id: srandom.c,v 1.7 1999/07/15 15:19:34 momjian Exp $ */
+/* $Id: srandom.c,v 1.8 1999/07/16 03:13:08 momjian Exp $ */
#include <stdlib.h>
-#include <math.h> /* for pow() prototype */
+#include <math.h>
#include <errno.h>
void
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 81231f41ea2eb1b881158664221b6a004224fba2..2bf92b5f03119d374007acef31d86dbbde4ce18b 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.110 1999/07/15 23:03:22 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.111 1999/07/16 03:13:19 momjian Exp $
*
* NOTES
*
@@ -33,9 +33,9 @@
*-------------------------------------------------------------------------
*/
/* moved here to prevent double define */
-#include <sys/param.h> /* for MAXHOSTNAMELEN on most */
+#include <sys/param.h>
#ifdef HAVE_NETDB_H
-#include <netdb.h> /* for MAXHOSTNAMELEN on some */
+#include <netdb.h>
#endif
#ifndef MAXHOSTNAMELEN
@@ -54,8 +54,8 @@
#endif /* !NO_UNISTD_H */
#include <ctype.h>
-#include <sys/types.h> /* for fd_set stuff */
-#include <sys/stat.h> /* for umask */
+#include <sys/types.h>
+#include <sys/stat.h>
#include <sys/time.h>
#include <sys/socket.h>
#ifdef HAVE_LIMITS_H
@@ -91,7 +91,7 @@
#include "nodes/nodes.h"
#include "storage/proc.h"
#ifndef HAVE_GETHOSTNAME
-#include "port-protos.h" /* For gethostname() */
+#include "port-protos.h"
#endif
#include "storage/fd.h"
#include "utils/trace.h"
diff --git a/src/backend/rewrite/locks.c b/src/backend/rewrite/locks.c
index ccf1d6223d4d693a2ad4ca9efd98d532b1c5da24..e6cce0e336d4b0246cfac65d5142548e8c169d4a 100644
--- a/src/backend/rewrite/locks.c
+++ b/src/backend/rewrite/locks.c
@@ -6,15 +6,15 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/rewrite/Attic/locks.c,v 1.19 1999/07/15 22:39:42 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/rewrite/Attic/locks.c,v 1.20 1999/07/16 03:13:20 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include "postgres.h" /* for oid defs */
-#include "utils/syscache.h" /* for SearchSysCache */
-#include "rewrite/locks.h" /* for rewrite specific lock defns */
+#include "postgres.h"
+#include "utils/syscache.h"
+#include "rewrite/locks.h"
-#include "access/heapam.h" /* for ACL checking */
+#include "access/heapam.h"
#include "utils/syscache.h"
#include "utils/acl.h"
#include "utils/builtins.h"
diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c
index 333e18ed6104ed051044199d5a13084b8ef411e0..971fecb72b6ae70b4d5833eaf13110ee94ecad53 100644
--- a/src/backend/rewrite/rewriteDefine.c
+++ b/src/backend/rewrite/rewriteDefine.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.32 1999/07/15 22:39:42 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.33 1999/07/16 03:13:21 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,7 +16,7 @@
#include "postgres.h"
-#include "access/heapam.h" /* access methods like amopenr */
+#include "access/heapam.h"
#include "catalog/pg_rewrite.h"
#include "parser/parse_relation.h"
#include "rewrite/rewriteDefine.h"
diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c
index 55dc617fd93d15842632773764ccd3455bcd98e7..d7e5dd3c7448116f3fc98ee862f4ed8ece6ce3af 100644
--- a/src/backend/rewrite/rewriteHandler.c
+++ b/src/backend/rewrite/rewriteHandler.c
@@ -6,7 +6,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.51 1999/07/15 22:39:43 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.52 1999/07/16 03:13:22 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -14,7 +14,7 @@
#include "postgres.h"
#include "miscadmin.h"
#include "parser/parse_type.h"
-#include "parser/parsetree.h" /* for parsetree manipulation */
+#include "parser/parsetree.h"
#include "parser/parse_relation.h"
#include "parser/parse_target.h"
diff --git a/src/backend/rewrite/rewriteManip.c b/src/backend/rewrite/rewriteManip.c
index b2fd0eb8f24d798b7d7d31d475118634a08469f1..283dd3f23065e8ebc03aac802d41b3e30771ed2c 100644
--- a/src/backend/rewrite/rewriteManip.c
+++ b/src/backend/rewrite/rewriteManip.c
@@ -6,13 +6,13 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.35 1999/07/15 22:39:44 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.36 1999/07/16 03:13:23 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <string.h>
#include "postgres.h"
-#include "parser/parsetree.h" /* for getrelid() */
+#include "parser/parsetree.h"
#include "utils/lsyscache.h"
#include "utils/builtins.h"
#include "rewrite/rewriteManip.h"
diff --git a/src/backend/rewrite/rewriteRemove.c b/src/backend/rewrite/rewriteRemove.c
index cf4c309f59698b80c301163376efec2ea0796a4a..aaad3102cff8a84ced8d20a885b64821f4c6d434 100644
--- a/src/backend/rewrite/rewriteRemove.c
+++ b/src/backend/rewrite/rewriteRemove.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.25 1999/07/15 22:39:45 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.26 1999/07/16 03:13:23 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -17,12 +17,12 @@
#include "postgres.h"
-#include "access/heapam.h" /* heap AM calls defined here */
-#include "catalog/catname.h" /* for RewriteRelationName */
+#include "access/heapam.h"
+#include "catalog/catname.h"
#include "catalog/pg_rewrite.h"
#include "utils/syscache.h"
-#include "rewrite/rewriteRemove.h" /* where the decls go */
+#include "rewrite/rewriteRemove.h"
#include "rewrite/rewriteSupport.h"
/*-----------------------------------------------------------------------
diff --git a/src/backend/rewrite/rewriteSupport.c b/src/backend/rewrite/rewriteSupport.c
index cbffc679f1622a847308c7aef17df5e02d8fb1d5..27c162b8fd51b9ae72886a5359458fdcb854afb4 100644
--- a/src/backend/rewrite/rewriteSupport.c
+++ b/src/backend/rewrite/rewriteSupport.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteSupport.c,v 1.34 1999/07/15 22:39:45 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteSupport.c,v 1.35 1999/07/16 03:13:24 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,8 +16,8 @@
#include "access/heapam.h"
#include "catalog/catname.h"
#include "catalog/indexing.h"
-#include "utils/catcache.h" /* for CacheContext */
-#include "utils/syscache.h" /* for SearchSysCache */
+#include "utils/catcache.h"
+#include "utils/syscache.h"
#include "rewrite/rewriteSupport.h"
diff --git a/src/backend/storage/buffer/buf_init.c b/src/backend/storage/buffer/buf_init.c
index 9d92bbe5a8fcef558f97e901723f2851c6cebf2b..39b4564d7f1b4670aa88a316908c1f6c93e24818 100644
--- a/src/backend/storage/buffer/buf_init.c
+++ b/src/backend/storage/buffer/buf_init.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_init.c,v 1.25 1999/06/26 15:58:28 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_init.c,v 1.26 1999/07/16 03:13:25 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -35,7 +35,7 @@
#include "utils/builtins.h"
#include "utils/hsearch.h"
#include "utils/memutils.h"
-#include "executor/execdebug.h" /* for NDirectFileRead */
+#include "executor/execdebug.h"
#include "catalog/catalog.h"
/*
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index 6acccfb2872bb55fe9968a8e2ad1a0895071e561..58b7e6c175e343a71451ba40d570c471c4a72997 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.58 1999/07/15 22:39:47 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.59 1999/07/16 03:13:28 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -55,7 +55,7 @@
#include "storage/smgr.h"
#include "miscadmin.h"
#include "utils/relcache.h"
-#include "executor/execdebug.h" /* for NDirectFileRead */
+#include "executor/execdebug.h"
extern SPINLOCK BufMgrLock;
extern long int ReadBufferCount;
diff --git a/src/backend/storage/buffer/localbuf.c b/src/backend/storage/buffer/localbuf.c
index 6162052f8fd7220d57f6bd6c289efafd6f8149b1..8977534c491e6d648553d799cb58e3c87a38843b 100644
--- a/src/backend/storage/buffer/localbuf.c
+++ b/src/backend/storage/buffer/localbuf.c
@@ -15,7 +15,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/buffer/localbuf.c,v 1.23 1999/07/15 22:39:47 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/localbuf.c,v 1.24 1999/07/16 03:13:28 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -32,7 +32,7 @@
#include "storage/smgr.h"
#include "utils/relcache.h"
-#include "executor/execdebug.h" /* for NDirectFileRead */
+#include "executor/execdebug.h"
extern long int LocalBufferFlushCount;
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index ca2e754ca4d4bfc41ad6ab7923a1a30dcde3cefe..10a8f83dc90fbfaf7368f8f6589254ab7e26d6f8 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -6,7 +6,7 @@
* Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $Id: fd.c,v 1.45 1999/07/15 15:19:47 momjian Exp $
+ * $Id: fd.c,v 1.46 1999/07/16 03:13:31 momjian Exp $
*
* NOTES:
*
@@ -48,7 +48,7 @@
#include <fcntl.h>
#include "postgres.h"
-#include "miscadmin.h" /* for DataDir */
+#include "miscadmin.h"
#include "storage/fd.h"
/*
diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c
index 89af501ff9806258bd41a5a2af9d6169069a9caf..31a4373b976aaa288425c134c7f414ca5bf8a709 100644
--- a/src/backend/storage/ipc/ipci.c
+++ b/src/backend/storage/ipc/ipci.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.27 1999/07/15 22:39:48 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.28 1999/07/16 03:13:34 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -18,7 +18,7 @@
#include "storage/sinval.h"
#include "storage/bufmgr.h"
-#include "miscadmin.h" /* for DebugLvl */
+#include "miscadmin.h"
/*
* SystemPortAddressCreateMemoryKey
diff --git a/src/backend/storage/ipc/shmqueue.c b/src/backend/storage/ipc/shmqueue.c
index 6ab9a183cfc48ee5d6ba8a88e43f10ca44a10037..317af7f02438ce97f94f90fca4c62602c23a2bb2 100644
--- a/src/backend/storage/ipc/shmqueue.c
+++ b/src/backend/storage/ipc/shmqueue.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmqueue.c,v 1.10 1999/02/13 23:18:13 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmqueue.c,v 1.11 1999/07/16 03:13:35 momjian Exp $
*
* NOTES
*
@@ -22,9 +22,9 @@
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h> /* for sprintf() */
+#include <stdio.h>
#include "postgres.h"
-#include "storage/shmem.h" /* where the declarations go */
+#include "storage/shmem.h"
/*#define SHMQUEUE_DEBUG*/
#ifdef SHMQUEUE_DEBUG
diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c
index 641dab03935ad6276e69be687705ea354a8f05dc..cb3b3c5ffc5ff31ca2d0881176d8347728a77cda 100644
--- a/src/backend/storage/large_object/inv_api.c
+++ b/src/backend/storage/large_object/inv_api.c
@@ -8,12 +8,12 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.54 1999/07/15 22:39:49 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.55 1999/07/16 03:13:37 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <sys/types.h>
-#include <stdio.h> /* for sprintf() */
+#include <stdio.h>
#include <string.h>
#include <sys/file.h>
#include <sys/stat.h>
diff --git a/src/backend/storage/lmgr/lmgr.c b/src/backend/storage/lmgr/lmgr.c
index 9ad92c8a753ecceb0ee138b3fc71f20adf0f7100..8087b3f4f3a2c0938d96dac0f1b477aff5f65c2c 100644
--- a/src/backend/storage/lmgr/lmgr.c
+++ b/src/backend/storage/lmgr/lmgr.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.30 1999/07/15 22:39:50 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.31 1999/07/16 03:13:40 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -27,7 +27,7 @@
#include "catalog/catalog.h"
-#include "access/transam.h" /* for AmiTransactionId */
+#include "access/transam.h"
extern Oid MyDatabaseId;
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
index bdf6bb9860eed9318c284011da82330108c0bfea..e2c05594e0300c60b5b9b573aab6734bea8d8705 100644
--- a/src/backend/storage/lmgr/lock.c
+++ b/src/backend/storage/lmgr/lock.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.58 1999/07/15 22:39:51 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.59 1999/07/16 03:13:43 momjian Exp $
*
* NOTES
* Outside modules can create a lock table and acquire/release
@@ -29,7 +29,7 @@
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h> /* for sprintf() */
+#include <stdio.h>
#include <string.h>
#include <sys/types.h>
#include <unistd.h>
diff --git a/src/backend/storage/lmgr/multi.c b/src/backend/storage/lmgr/multi.c
index 12c7d70e82bb79a22bfdebe5124607555fb08013..03ae7e9ed6ad915ba643ad1513c54a739d65292c 100644
--- a/src/backend/storage/lmgr/multi.c
+++ b/src/backend/storage/lmgr/multi.c
@@ -12,7 +12,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.30 1999/07/15 20:32:27 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.31 1999/07/16 03:13:45 momjian Exp $
*
* NOTES:
* (1) The lock.c module assumes that the caller here is doing
@@ -27,7 +27,7 @@
#include "storage/multilev.h"
#include "utils/rel.h"
-#include "miscadmin.h" /* MyDatabaseId */
+#include "miscadmin.h"
static bool MultiAcquire(LOCKMETHOD lockmethod, LOCKTAG *tag,
LOCKMODE lockmode, PG_LOCK_LEVEL level);
diff --git a/src/backend/storage/lmgr/single.c b/src/backend/storage/lmgr/single.c
index 37aed3e53becffceceedb026a3a2dcff6a3984cf..11b9a262cd89b829204dc348c6769414c929f915 100644
--- a/src/backend/storage/lmgr/single.c
+++ b/src/backend/storage/lmgr/single.c
@@ -13,7 +13,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/single.c,v 1.10 1999/02/13 23:18:29 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/single.c,v 1.11 1999/07/16 03:13:46 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -21,7 +21,7 @@
#include "postgres.h"
-#include "storage/lmgr.h" /* where the declarations go */
+#include "storage/lmgr.h"
#include "storage/lock.h"
#include "storage/multilev.h"
#include "utils/rel.h"
diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
index 33cf5da88ad5a226a3fcb45b3ee4ca2516535fae..f96431d5a4c5dbf83cac4ef85003ac1666ac5d5f 100644
--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -7,21 +7,21 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.48 1999/07/15 22:39:54 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.49 1999/07/16 03:13:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <unistd.h>
-#include <stdio.h> /* for sprintf() */
+#include <stdio.h>
#include <string.h>
-#include <fcntl.h> /* for open() flags */
+#include <fcntl.h>
#include <sys/file.h>
#include "postgres.h"
-#include "miscadmin.h" /* for DataDir */
+#include "miscadmin.h"
#include "catalog/catalog.h"
-#include "storage/smgr.h" /* where the declarations go */
+#include "storage/smgr.h"
#undef DIAGNOSTIC
diff --git a/src/backend/tcop/dest.c b/src/backend/tcop/dest.c
index 7b2e759df94418efc21758282476c322cb143095..b82da2f350bd346bf92950eb2ca1fec577735b5e 100644
--- a/src/backend/tcop/dest.c
+++ b/src/backend/tcop/dest.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.33 1999/07/15 22:39:55 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.34 1999/07/16 03:13:49 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -32,7 +32,7 @@
* versa --- so I think I'll just leave 'em alone for now. tgl 1/99.
*
*/
-#include <stdio.h> /* for sprintf() */
+#include <stdio.h>
#include <string.h>
#include "postgres.h"
diff --git a/src/backend/tcop/fastpath.c b/src/backend/tcop/fastpath.c
index df1641d8b7df602270b057fb68bc7b390edfcb4b..8461711fc95bd97708e58da711f739509ddd900d 100644
--- a/src/backend/tcop/fastpath.c
+++ b/src/backend/tcop/fastpath.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.26 1999/07/15 22:39:56 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.27 1999/07/16 03:13:50 momjian Exp $
*
* NOTES
* This cruft is the server side of PQfn.
@@ -62,12 +62,12 @@
#include "postgres.h"
-#include "utils/builtins.h" /* for oideq */
+#include "utils/builtins.h"
#include "tcop/fastpath.h"
#include "libpq/libpq.h"
#include "libpq/pqformat.h"
-#include "access/xact.h" /* for TransactionId/CommandId protos */
+#include "access/xact.h"
#include "utils/syscache.h"
#include "catalog/pg_proc.h"
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 871aa7beddc568f052d451ad882b291976ef3356..5cbc2ce277708bbaa0a7faf1ba4816bed513d97e 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.121 1999/07/15 22:39:56 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.122 1999/07/16 03:13:50 momjian Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
@@ -24,9 +24,9 @@
#include <sys/time.h>
#include <sys/types.h>
#include <fcntl.h>
-#include <sys/param.h> /* for MAXHOSTNAMELEN on most */
+#include <sys/param.h>
#ifndef MAXHOSTNAMELEN
-#include <netdb.h> /* for MAXHOSTNAMELEN on some */
+#include <netdb.h>
#endif
#ifndef MAXHOSTNAMELEN /* for MAXHOSTNAMELEN under sco3.2v5.0.2 */
#include <sys/socket.h>
@@ -52,10 +52,10 @@
#include "optimizer/cost.h"
#include "optimizer/planner.h"
#include "parser/parser.h"
-#include "rewrite/rewriteHandler.h" /* for QueryRewrite() */
+#include "rewrite/rewriteHandler.h"
#include "tcop/fastpath.h"
#include "tcop/pquery.h"
-#include "tcop/tcopprot.h" /* where declarations for this file go */
+#include "tcop/tcopprot.h"
#include "tcop/utility.h"
#include "utils/ps_status.h"
#include "utils/temprel.h"
@@ -1502,7 +1502,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
if (!IsUnderPostmaster)
{
puts("\nPOSTGRES backend interactive interface ");
- puts("$Revision: 1.121 $ $Date: 1999/07/15 22:39:56 $\n");
+ puts("$Revision: 1.122 $ $Date: 1999/07/16 03:13:50 $\n");
}
/* ----------------
diff --git a/src/backend/tioga/tgRecipe.c b/src/backend/tioga/tgRecipe.c
index ac95c178499bafded63a27a8d1adf48f6034d169..933e176d5935826b4e285c974705f54cea2731d4 100644
--- a/src/backend/tioga/tgRecipe.c
+++ b/src/backend/tioga/tgRecipe.c
@@ -11,7 +11,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tioga/Attic/tgRecipe.c,v 1.12 1999/05/10 00:45:49 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tioga/Attic/tgRecipe.c,v 1.13 1999/07/16 03:13:54 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -20,7 +20,7 @@
#include "postgres.h"
#include "tioga/tgRecipe.h"
-#include "catalog/catalog.h" /* for newoid() */
+#include "catalog/catalog.h"
static Arr_TgString *TextArray2ArrTgString(char *str);
diff --git a/src/backend/utils/adt/bool.c b/src/backend/utils/adt/bool.c
index a05ababecbd990dd64f30e8def7dd51ff28b2523..3f2ac134f15a0a1fe36ffb8b8112874bd49a7fc2 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.18 1999/07/15 15:20:11 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/bool.c,v 1.19 1999/07/16 03:13:56 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,7 +15,7 @@
#include <string.h>
#include "postgres.h"
-#include "utils/builtins.h" /* where the declarations go */
+#include "utils/builtins.h"
/*****************************************************************************
* USER I/O ROUTINES *
diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c
index c3feaa50636a12c6860d86a563c6bf06bbbc077e..2c352bcd8083effd0e5b3cad5c371bb6b179e9b8 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.34 1999/07/15 15:20:13 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.35 1999/07/16 03:13:57 momjian Exp $
*
* NOTES
* This code is actually (almost) unused.
@@ -39,7 +39,7 @@
#include <limits.h>
#endif
#include "access/xact.h"
-#include "utils/builtins.h" /* where function declarations go */
+#include "utils/builtins.h"
#include "utils/dt.h"
#define INVALID_RELTIME_STR "Undefined RelTime"
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index 0a60e98a9f70c0c8a947eb5fadf14bf68d4b76c0..cd1f0327de35e2d9bd9f5857594de97934fb391e 100644
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -7,11 +7,11 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.36 1999/07/15 22:39:58 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.37 1999/07/16 03:13:58 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h> /* for sprintf() */
+#include <stdio.h>
#include <string.h>
#include <limits.h>
diff --git a/src/backend/utils/adt/filename.c b/src/backend/utils/adt/filename.c
index f8c049d257f5a1297d852f4ddde070d04f867307..b6cefbab1feb7c944142e32e36e5e1ca278b1ea8 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.20 1999/07/15 23:03:26 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.21 1999/07/16 03:14:00 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -20,7 +20,7 @@
#include "postgres.h"
#include "miscadmin.h"
-#include "utils/builtins.h" /* where function declarations go */
+#include "utils/builtins.h"
char *
filename_in(char *file)
diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c
index daf830e552f11da469a58a603c6f1ac424ac43b2..e9bbe719895fbfcb316ab2379d82c683ba2b5873 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.45 1999/07/15 15:20:16 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.46 1999/07/16 03:14:00 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -45,7 +45,7 @@
* for calls to pow(), exp() since on some machines (my Linux box
* included) these routines do not set errno. - tgl 97/05/10
*/
-#include <stdio.h> /* for sprintf() */
+#include <stdio.h>
#include <string.h>
#include <ctype.h>
#include <stdlib.h>
@@ -60,7 +60,7 @@
#include <limits.h>
#endif
#include "fmgr.h"
-#include "utils/builtins.h" /* for ftod() prototype */
+#include "utils/builtins.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 743a823c2a81c39b4ad17fe45ff3ffcfb8050e06..a3f0179212c45717acc28e0b125eca98fea5ef5a 100644
--- a/src/backend/utils/adt/geo_ops.c
+++ b/src/backend/utils/adt/geo_ops.c
@@ -7,15 +7,15 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.43 1999/07/15 15:20:16 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.44 1999/07/16 03:14:01 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <math.h>
#include <limits.h>
#include <float.h>
-#include <stdio.h> /* for sprintf proto, etc. */
-#include <stdlib.h> /* for strtod, etc. */
+#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <ctype.h>
diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c
index 39776901af2507afda2d2a5cec9e14f23c4ba1f5..394fae2757ce138c895d21f924c4cfef74e5557c 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.24 1999/07/15 22:39:59 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.25 1999/07/16 03:14:02 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -35,7 +35,7 @@
#endif
#include "postgres.h"
-#include "utils/builtins.h" /* where the declarations go */
+#include "utils/builtins.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 6b2be8a5a02ee25b9b8cda89dab8002d213cf56d..1c930fb5fab8d72e7bf29a6c77499e82a2e5e930 100644
--- a/src/backend/utils/adt/int8.c
+++ b/src/backend/utils/adt/int8.c
@@ -5,8 +5,8 @@
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h> /* for sprintf proto, etc. */
-#include <stdlib.h> /* for strtod, etc. */
+#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#include <time.h>
diff --git a/src/backend/utils/adt/like.c b/src/backend/utils/adt/like.c
index 09925bb83024825c9dd5a2f1401331018ba42d94..44a767e1d2e19b0b116fc7ae8d18b42acc20dc63 100644
--- a/src/backend/utils/adt/like.c
+++ b/src/backend/utils/adt/like.c
@@ -18,8 +18,8 @@
*-------------------------------------------------------------------------
*/
#include <string.h>
-#include "postgres.h" /* postgres system include file */
-#include "utils/builtins.h" /* where the function declarations go */
+#include "postgres.h"
+#include "utils/builtins.h"
#include "mb/pg_wchar.h"
static int like(pg_wchar * text, pg_wchar * p);
@@ -110,7 +110,7 @@ textnlike(struct varlena * s, struct varlena * p)
}
-/* $Revision: 1.27 $
+/* $Revision: 1.28 $
** "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/name.c b/src/backend/utils/adt/name.c
index e04ad84cc6262deb5c8d736e5100d70ba80920fc..86ebe1be701620f091f338e5e50cb88d8325b84e 100644
--- a/src/backend/utils/adt/name.c
+++ b/src/backend/utils/adt/name.c
@@ -11,13 +11,13 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.20 1999/07/15 15:20:18 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.21 1999/07/16 03:14:04 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <string.h>
#include "postgres.h"
-#include "utils/builtins.h" /* where the declarations go */
+#include "utils/builtins.h"
/*****************************************************************************
* USER I/O ROUTINES (none) *
diff --git a/src/backend/utils/adt/not_in.c b/src/backend/utils/adt/not_in.c
index 2d26096634b68dcedc92ad6805d580bda830e217..cf2a3ed058b43b1a2890ce602b332d6243f00403 100644
--- a/src/backend/utils/adt/not_in.c
+++ b/src/backend/utils/adt/not_in.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/not_in.c,v 1.17 1999/07/15 22:40:00 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/not_in.c,v 1.18 1999/07/16 03:14:04 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -26,7 +26,7 @@
#include <string.h>
#include "postgres.h"
#include "access/heapam.h"
-#include "utils/builtins.h" /* where function decls go */
+#include "utils/builtins.h"
static int my_varattno(Relation rd, char *a);
diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c
index fd09f386e8af771db5dbcf1034c78a70b6257dcb..072e3ffcd5aa6a7d389a1b072eed3bf3b3f04e9b 100644
--- a/src/backend/utils/adt/numutils.c
+++ b/src/backend/utils/adt/numutils.c
@@ -10,18 +10,18 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.35 1999/07/15 22:40:00 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.36 1999/07/16 03:14:06 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h> /* for sprintf() */
+#include <stdio.h>
#include <errno.h>
#include <math.h>
#ifdef HAVE_LIMITS_H
#include <limits.h>
#endif
#include "postgres.h"
-#include "utils/builtins.h" /* where the declarations go */
+#include "utils/builtins.h"
#ifndef HAVE_MEMMOVE
#else
#include <string.h>
diff --git a/src/backend/utils/adt/oid.c b/src/backend/utils/adt/oid.c
index ec55bcd451d8541db3cb24fe15b4a36837070d82..806bd170e79a5693f9f48226583b610d79a37b70 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.25 1999/07/15 15:20:19 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.26 1999/07/16 03:14:06 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,7 +16,7 @@
#include <string.h>
#include "postgres.h"
-#include "utils/builtins.h" /* where function declarations go */
+#include "utils/builtins.h"
/*****************************************************************************
* USER I/O ROUTINES *
diff --git a/src/backend/utils/adt/regexp.c b/src/backend/utils/adt/regexp.c
index 9a30652a5eeddbca1291aa997d6234ae33cdd15f..8b4e2c5a17297258679096fe7102ec99c70e7165 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.25 1999/07/15 23:03:27 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.26 1999/07/16 03:14:07 momjian Exp $
*
* Alistair Crooks added the code for the regex caching
* agc - cached the regular expressions used - there's a good chance
@@ -28,11 +28,11 @@
*-------------------------------------------------------------------------
*/
#include <string.h>
-#include "postgres.h" /* postgres system include file */
+#include "postgres.h"
#include "regex/regex.h"
-#include "utils/builtins.h" /* where the function declarations go */
+#include "utils/builtins.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 c0337b93fece1066e6346060a04fcde1eaf35a62..ec6adb44e378121a8d16561b25da374a6d4fe7be 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.39 1999/07/15 22:40:00 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.40 1999/07/16 03:14:08 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -22,7 +22,7 @@
#include "catalog/indexing.h"
#include "catalog/pg_proc.h"
#include "catalog/pg_type.h"
-#include "utils/builtins.h" /* where function declarations go */
+#include "utils/builtins.h"
/*****************************************************************************
* USER I/O ROUTINES *
diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
index ade43a2be2cfef3df34cf81511a9f7b9d7cd4519..c0a86078d6eca4ba32f42d8f09400149f0fd28f3 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.32 1999/07/15 22:40:01 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.33 1999/07/16 03:14:09 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -22,12 +22,11 @@
#include "postgres.h"
#include "access/heapam.h"
-#include "utils/builtins.h" /* for textout() prototype and where the
- * declarations go */
+#include "utils/builtins.h"
#include "catalog/catname.h"
#include "utils/syscache.h"
-#include "utils/lsyscache.h" /* for get_oprrest() */
+#include "utils/lsyscache.h"
#include "catalog/pg_statistic.h"
/* N is not a valid var/constant or relation id */
diff --git a/src/backend/utils/adt/sets.c b/src/backend/utils/adt/sets.c
index 20ec4921bff1a4aa008a90283cc3fb7e5b0ed6f9..f0787fdd870a3fd03c398b58e12115fa806baca3 100644
--- a/src/backend/utils/adt/sets.c
+++ b/src/backend/utils/adt/sets.c
@@ -9,21 +9,21 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.22 1999/07/15 22:40:01 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.23 1999/07/16 03:14:09 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h> /* for sprintf() */
+#include <stdio.h>
#include <string.h>
#include "postgres.h"
#include "access/heapam.h"
-#include "catalog/pg_proc.h" /* for Form_pg_proc */
-#include "catalog/catname.h" /* for ProcedureRelationName */
-#include "catalog/indexing.h" /* for Num_pg_proc_indices */
-#include "utils/sets.h" /* for GENERICSETNAME */
-#include "utils/syscache.h" /* for PROOID */
+#include "catalog/pg_proc.h"
+#include "catalog/catname.h"
+#include "catalog/indexing.h"
+#include "utils/sets.h"
+#include "utils/syscache.h"
extern CommandDest whereToSendOutput; /* defined in tcop/postgres.c */
diff --git a/src/backend/utils/adt/tid.c b/src/backend/utils/adt/tid.c
index 621dcc53d03f267327077c8c9cec2d7cad351b73..383dcbbdd9ca388b854b3a1d7417321b1bdf6e58 100644
--- a/src/backend/utils/adt/tid.c
+++ b/src/backend/utils/adt/tid.c
@@ -7,18 +7,18 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.9 1999/07/15 22:40:01 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.10 1999/07/16 03:14:11 momjian Exp $
*
* NOTES
* input routine largely stolen from boxin().
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h> /* for sprintf() */
+#include <stdio.h>
#include <string.h>
#include "postgres.h"
-#include "utils/builtins.h" /* where function declarations go */
+#include "utils/builtins.h"
#define LDELIM '('
#define RDELIM ')'
diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c
index 0d746a3c64e44086b2ac9683a4589c122a6dcfd8..aae9819b37f122e97869be1bfe6c30e12dcd2570 100644
--- a/src/backend/utils/adt/varchar.c
+++ b/src/backend/utils/adt/varchar.c
@@ -7,11 +7,11 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.50 1999/07/15 22:40:01 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.51 1999/07/16 03:14:12 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h> /* for sprintf() */
+#include <stdio.h>
#include <string.h>
#include "postgres.h"
#include "access/htup.h"
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
index 61b07f97feaea79be15b3118de419b189dd5b2b7..1529341956182cd3e75e056c45885d7d9ef9f4dc 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.50 1999/07/15 15:20:20 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.51 1999/07/16 03:14:13 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,7 +15,7 @@
#include <string.h>
#include "postgres.h"
-#include "utils/builtins.h" /* where function declarations go */
+#include "utils/builtins.h"
#include "mb/pg_wchar.h"
diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
index 663eeb5f774591fa38e21b0d8a460abc56fbeaf5..2c436cc9790f01d2acbf02b1962ef8d095b0a496 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.45 1999/07/15 22:40:02 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.46 1999/07/16 03:14:15 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -19,7 +19,7 @@
#include "utils/catcache.h"
#include "access/valid.h"
#include "miscadmin.h"
-#include "catalog/pg_type.h" /* for OID of int28 type */
+#include "catalog/pg_type.h"
static void CatCacheRemoveCTup(CatCache *cache, Dlelem *e);
static Index CatalogCacheComputeHashIndex(struct catcache * cacheInP);
diff --git a/src/backend/utils/cache/fcache.c b/src/backend/utils/cache/fcache.c
index 0e1eb945cb410ac3e07e5bfa158fd005f472114d..3b775aa8ce6386c02e5c1480df808f0bde669765 100644
--- a/src/backend/utils/cache/fcache.c
+++ b/src/backend/utils/cache/fcache.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/fcache.c,v 1.23 1999/07/15 22:40:03 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/fcache.c,v 1.24 1999/07/16 03:14:16 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -18,7 +18,7 @@
#include "catalog/pg_type.h"
#include "catalog/pg_proc.h"
#include "catalog/pg_language.h"
-#include "parser/parsetree.h" /* for getrelname() */
+#include "parser/parsetree.h"
#include "utils/builtins.h"
#include "utils/fcache2.h"
#ifndef HAVE_MEMMOVE
diff --git a/src/backend/utils/cache/inval.c b/src/backend/utils/cache/inval.c
index 393834943411397bf118f88430b512b871248b71..b3d1fdc0873020adb0206eed2c57dea8c967bebe 100644
--- a/src/backend/utils/cache/inval.c
+++ b/src/backend/utils/cache/inval.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/inval.c,v 1.25 1999/07/15 23:03:27 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/inval.c,v 1.26 1999/07/16 03:14:17 momjian Exp $
*
* Note - this code is real crufty...
*
@@ -23,7 +23,7 @@
#include "utils/catcache.h"
#include "utils/inval.h"
#include "utils/relcache.h"
-#include "catalog/catname.h" /* XXX to support hacks below */
+#include "catalog/catname.h"
static InvalidationEntry InvalidationEntryAllocate(uint16 size);
static void LocalInvalidInvalidate(LocalInvalid invalid, void (*function) ());
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index b2bfdf14f3a76452ebda2261d640e1ac3cc293c7..3162d9a55085b0b6f30fd1d80375689394f529d4 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.64 1999/07/15 22:40:04 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.65 1999/07/16 03:14:18 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -30,7 +30,7 @@
*
*/
#include <sys/types.h>
-#include <stdio.h> /* for sprintf() */
+#include <stdio.h>
#include <errno.h>
#include <sys/file.h>
#include <fcntl.h>
diff --git a/src/backend/utils/error/assert.c b/src/backend/utils/error/assert.c
index 0bb6785d62dad19a6a941e3d0763f72894663d54..0f7b6eb8a6c710d2dd970be5cc66c3a136e28e73 100644
--- a/src/backend/utils/error/assert.c
+++ b/src/backend/utils/error/assert.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/error/assert.c,v 1.14 1999/07/15 22:40:05 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/error/assert.c,v 1.15 1999/07/16 03:14:20 momjian Exp $
*
* NOTE
* This should eventually work with elog(), dlog(), etc.
@@ -17,7 +17,7 @@
#include <stdio.h>
#include <unistd.h>
-#include "postgres.h" /* where the declaration goes */
+#include "postgres.h"
#include "utils/exc.h"
#include "utils/trace.h"
diff --git a/src/backend/utils/error/exc.c b/src/backend/utils/error/exc.c
index 7384847d18e9894d970a5a00d6b4bfc244ad0dde..587371ff3412ad45508a889c60d302710ca73d71 100644
--- a/src/backend/utils/error/exc.c
+++ b/src/backend/utils/error/exc.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.25 1999/05/25 16:12:26 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.26 1999/07/16 03:14:22 momjian Exp $
*
* NOTE
* XXX this code needs improvement--check for state violations and
@@ -15,7 +15,7 @@
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h> /* XXX use own I/O routines */
+#include <stdio.h>
#include <errno.h>
#include <string.h>
diff --git a/src/backend/utils/error/excabort.c b/src/backend/utils/error/excabort.c
index c780ad79531902ffcc32669275e39290bbd55532..486b16a0a41d9603cc46a8f9e6887a5664e7b42b 100644
--- a/src/backend/utils/error/excabort.c
+++ b/src/backend/utils/error/excabort.c
@@ -7,14 +7,14 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/excabort.c,v 1.6 1999/02/13 23:19:48 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/excabort.c,v 1.7 1999/07/16 03:14:22 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include "postgres.h"
-#include "utils/exc.h" /* where function declarations go */
+#include "utils/exc.h"
void
ExcAbort(const Exception *excP,
diff --git a/src/backend/utils/init/findbe.c b/src/backend/utils/init/findbe.c
index 783f8ac1b95857a13be86548639bea6fda7b52ba..baef1f6fffdaace4b9548e8815fa3e74313922dd 100644
--- a/src/backend/utils/init/findbe.c
+++ b/src/backend/utils/init/findbe.c
@@ -6,7 +6,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/findbe.c,v 1.14 1999/05/25 16:12:33 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/findbe.c,v 1.15 1999/07/16 03:14:24 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -19,7 +19,7 @@
#include <unistd.h>
#include "postgres.h"
-#include "miscadmin.h" /* for DebugLvl */
+#include "miscadmin.h"
#ifndef S_IRUSR /* XXX [TRH] should be in a header */
#define S_IRUSR S_IREAD
diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c
index 8e6d2b1370a9768ff2e353b4e43079f6623bbde4..0f131fa4fe796c7afd5cc1f7b26e9f05dc6fd772 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.33 1999/07/15 23:03:30 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.34 1999/07/16 03:14:25 momjian Exp $
*
* NOTES
* Globals used all over the place should be declared here and not
@@ -24,7 +24,7 @@
#include <unistd.h>
#include "postgres.h"
-#include "miscadmin.h" /* where the declarations go */
+#include "miscadmin.h"
#include "storage/backendid.h"
#include "storage/lmgr.h"
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 55a6905707ec8cc886f305ba79d438ee310f4269..28a24bcc39a1b04a6a899cddb6e6757c19d4f704 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -7,24 +7,24 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.31 1999/07/15 22:40:09 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.32 1999/07/16 03:14:26 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <string.h>
-#include <sys/param.h> /* for MAXPATHLEN */
+#include <sys/param.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/file.h>
#include <stdio.h>
#include <unistd.h>
-#include <grp.h> /* for getgrgid */
-#include <pwd.h> /* for getpwuid */
+#include <grp.h>
+#include <pwd.h>
#include "postgres.h"
-#include "miscadmin.h" /* where the declarations go */
+#include "miscadmin.h"
#include "catalog/catname.h"
#include "catalog/pg_shadow.h"
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 0474539462ef08d0328b2efa5deeac72ad9df34e..d1bd79f4c08e3fb36efba43bc4f69b46374fccb6 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.43 1999/07/15 23:03:30 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.44 1999/07/16 03:14:26 momjian Exp $
*
* NOTES
* InitPostgres() is the function called from PostgresMain
@@ -44,12 +44,11 @@
#include "access/heapam.h"
#include "utils/syscache.h"
-#include "storage/bufpage.h" /* for page layout, for
- * InitMyDatabaseInfo() */
+#include "storage/bufpage.h"
#include "storage/sinval.h"
-#include "miscadmin.h" /* for global decls */
-#include "utils/portal.h" /* for EnablePortalManager, etc. */
+#include "miscadmin.h"
+#include "utils/portal.h"
#include "utils/inval.h"
diff --git a/src/backend/utils/mmgr/aset.c b/src/backend/utils/mmgr/aset.c
index 5f8e4b4def63d12478db4a0364837d68db43758a..c5ccc8df12e4848dd8a8c1d780e085d878ccacbc 100644
--- a/src/backend/utils/mmgr/aset.c
+++ b/src/backend/utils/mmgr/aset.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/aset.c,v 1.17 1999/07/15 22:40:12 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/aset.c,v 1.18 1999/07/16 03:14:28 momjian Exp $
*
* NOTE:
* This is a new (Feb. 05, 1999) implementation of the allocation set
@@ -23,7 +23,7 @@
*/
#include <stdio.h>
#include "postgres.h"
-#include "utils/memutils.h" /* where funnction declarations go */
+#include "utils/memutils.h"
#ifndef HAVE_MEMMOVE
#else
#include <string.h>
diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c
index c3d272029b686543397633d1d791e2e3582fa22d..ff144e1f4fbcb4d2e80bede1fa06513970eb1790 100644
--- a/src/backend/utils/mmgr/mcxt.c
+++ b/src/backend/utils/mmgr/mcxt.c
@@ -7,11 +7,11 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/mcxt.c,v 1.16 1999/07/15 22:40:13 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/mcxt.c,v 1.17 1999/07/16 03:14:28 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include <stdio.h> /* XXX for printf debugging */
+#include <stdio.h>
#include "postgres.h"
diff --git a/src/backend/utils/mmgr/oset.c b/src/backend/utils/mmgr/oset.c
index 9a0d2781c13ab39f114c694f7c78cafd6d1c37ce..e39e87ab84f3727c22e8ec3e3817014b9eaf618c 100644
--- a/src/backend/utils/mmgr/oset.c
+++ b/src/backend/utils/mmgr/oset.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/oset.c,v 1.13 1999/05/26 12:56:05 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/oset.c,v 1.14 1999/07/16 03:14:29 momjian Exp $
*
* NOTE
* XXX This is a preliminary implementation which lacks fail-fast
@@ -17,7 +17,7 @@
*/
#include "postgres.h"
-#include "utils/memutils.h" /* where declarations of this file goes */
+#include "utils/memutils.h"
static Pointer OrderedElemGetBase(OrderedElem elem);
static void OrderedElemPush(OrderedElem elem);
diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c
index a5768237152aac5902f6c1f61b7a9d6d17260508..cb74992c97d7f97bd8487f048fa96ac13acce571 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.25 1999/07/15 22:40:13 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.26 1999/07/16 03:14:30 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -73,8 +73,8 @@
* PortalHeapMemory y y y *
*
*/
-#include <stdio.h> /* for sprintf() */
-#include <string.h> /* for strlen, strncpy */
+#include <stdio.h>
+#include <string.h>
#include "postgres.h"