Some compile failure fixes from Keith Parks <emkxp01@mtcc.demon.co.uk>

src/backend/catalog/catalog.c

@@ -7,24 +7,18 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.3 1996/11/03 23:27:00 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.4 1996/11/06 06:47:01 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>	/* XXX */
+#include <postgres.h>
 
-#include "postgres.h"
-#include "miscadmin.h"  /* for DataDir */
-
-#include "utils/syscache.h"
-#include "storage/buf.h"
-#include "utils/palloc.h"
-
-#include "catalog/catname.h"	/* NameIs{,Shared}SystemRelationName */
-#include "catalog/pg_attribute.h"
-#include "catalog/pg_type.h"
-#include "catalog/catalog.h"
-#include "access/transam.h"
+#include <miscadmin.h>  /* for DataDir */
+#include <utils/syscache.h>
+#include <catalog/catname.h>	/* NameIs{,Shared}SystemRelationName */
+#include <catalog/pg_type.h>
+#include <catalog/catalog.h>
+#include <access/transam.h>
 
 /*
  * relpath		- path to the relation

src/backend/catalog/heap.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.4 1996/11/05 11:57:50 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.5 1996/11/06 06:47:03 scrappy Exp $
  *
  * INTERFACE ROUTINES
  *	heap_creatr()		- Create an uncataloged heap relation
@@ -24,44 +24,49 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>	/* for sprintf() */
-#include <sys/file.h>
-#include <string.h>
-
-#include "postgres.h"
+#include <postgres.h>
+
+#include <utils/mcxt.h>
+#include <parser/catalog_utils.h>
+#include <catalog/index.h>
+#include <fmgr.h>
+#include <catalog/pg_index.h>
+#include <catalog/pg_type.h>
+#include <catalog/catname.h>
+#include <utils/relcache.h>
+#include <storage/bufmgr.h>
+#include <catalog/heap.h>
+#include <rewrite/rewriteRemove.h>
+#include <storage/lmgr.h>
+#include <storage/smgr.h>
+#include <access/relscan.h>
+#include <utils/tqual.h>
 
+/*
 #include <catalog/heap.h>
 #include <catalog/pg_proc.h>
-
-#include "parser/catalog_utils.h"
-
-#include "access/heapam.h"
-#include "access/genam.h"
-#include "access/istrat.h"
-#include "storage/bufmgr.h"
-#include "lib/hasht.h"
-#include "miscadmin.h"
-#include "fmgr.h"
-#include "utils/builtins.h"
-#include "utils/mcxt.h"
-#include "utils/palloc.h"
-#include "utils/relcache.h"
-
-#include "catalog/catname.h"
-#include "catalog/pg_attribute.h"
-#include "catalog/pg_index.h"
-#include "catalog/pg_inherits.h"
-#include "catalog/pg_ipl.h"
-#include "catalog/index.h"
-#include "catalog/indexing.h"
-
-#include "catalog/catalog.h"
-
-#include "storage/lmgr.h"
-
-#include "rewrite/rewriteRemove.h"
-
-#include "storage/smgr.h"
+#include <parser/catalog_utils.h>
+#include <access/heapam.h>
+#include <access/genam.h>
+#include <access/istrat.h>
+#include <storage/bufmgr.h>
+#include <lib/hasht.h>
+#include <miscadmin.h>
+#include <fmgr.h>
+#include <utils/builtins.h>
+#include <utils/mcxt.h>
+#include <utils/relcache.h>
+#include <catalog/catname.h>
+#include <catalog/pg_index.h>
+#include <catalog/pg_inherits.h>
+#include <catalog/pg_ipl.h>
+#include <catalog/index.h>
+#include <catalog/indexing.h>
+#include <catalog/catalog.h>
+#include <storage/lmgr.h>
+#include <rewrite/rewriteRemove.h>
+#include <storage/smgr.h>
+*/
 
 static void AddNewAttributeTuples(Oid new_rel_oid, TupleDesc tupdesc);
 static void CheckAttributeNames(TupleDesc tupdesc);
@@ -1174,263 +1179,4 @@ DeletePgTypeTuple(Relation rdesc)
     
     /* ----------------
      *	now scan pg_attribute.  if any other relations have
-     *  attributes of the type of the relation we are deleteing
-     *  then we have to disallow the deletion.  should talk to
-     *  stonebraker about this.  -cim 6/19/90
-     * ----------------
-     */
-    typoid = tup->t_oid;
-    
-    pg_attribute_desc = heap_openr(AttributeRelationName);
-    
-    ScanKeyEntryInitialize(&attkey,
-			   0, Anum_pg_attribute_atttypid, F_INT4EQ,
-			   typoid);
-    
-    pg_attribute_scan = heap_beginscan(pg_attribute_desc,
-				       0,
-				       NowTimeQual,
-				       1,
-				       &attkey);
-    
-    /* ----------------
-     *	try and get a pg_attribute tuple.  if we succeed it means
-     *  we cant delete the relation because something depends on
-     *  the schema.
-     * ----------------
-     */
-    atttup = heap_getnext(pg_attribute_scan, 0, (Buffer *)NULL);
-    
-    if (PointerIsValid(atttup)) {
-	Oid relid = ((AttributeTupleForm) GETSTRUCT(atttup))->attrelid;
-	
-	heap_endscan(pg_type_scan);
-	heap_close(pg_type_desc);
-	heap_endscan(pg_attribute_scan);
-	heap_close(pg_attribute_desc);
-	
-	elog(WARN, "DeletePgTypeTuple: att of type %s exists in relation %d",
-	     &rdesc->rd_rel->relname, relid);	
-    }
-    heap_endscan(pg_attribute_scan);
-    heap_close(pg_attribute_desc);
-    
-    /* ----------------
-     *  Ok, it's safe so we delete the relation tuple
-     *  from pg_type and finish up.  But first end the scan so that
-     *  we release the read lock on pg_type.  -mer 13 Aug 1991
-     * ----------------
-     */
-    heap_endscan(pg_type_scan);
-    heap_delete(pg_type_desc, &tup->t_ctid);
-    
-    heap_close(pg_type_desc);
-}
-
-/* --------------------------------
- *	heap_destroy
- *
- * --------------------------------
- */
-void
-heap_destroy(char *relname)
-{
-    Relation	rdesc;
-    
-    /* ----------------
-     *	first open the relation.  if the relation does exist,
-     *  heap_openr() returns NULL.
-     * ----------------
-     */
-    rdesc = heap_openr(relname);
-    if (rdesc == NULL)
-	elog(WARN,"Relation %s Does Not Exist!", relname);
-    
-    /* ----------------
-     *	prevent deletion of system relations
-     * ----------------
-     */
-    if (IsSystemRelationName(RelationGetRelationName(rdesc)->data))
-	elog(WARN, "amdestroy: cannot destroy %s relation",
-	     &rdesc->rd_rel->relname);
-    
-    /* ----------------
-     *	remove inheritance information
-     * ----------------
-     */
-    RelationRemoveInheritance(rdesc);
-    
-    /* ----------------
-     *	remove indexes if necessary
-     * ----------------
-     */
-    if (rdesc->rd_rel->relhasindex) {
-	RelationRemoveIndexes(rdesc);
-    }
-
-    /* ----------------
-     *	remove rules if necessary
-     * ----------------
-     */
-    if (rdesc->rd_rules != NULL) {
-	RelationRemoveRules(rdesc->rd_id);
-    }
-    
-    /* ----------------
-     *	delete attribute tuples
-     * ----------------
-     */
-    DeletePgAttributeTuples(rdesc);
-    
-    /* ----------------
-     *	delete type tuple.  here we want to see the effects
-     *  of the deletions we just did, so we use setheapoverride().
-     * ----------------
-     */
-    setheapoverride(true);
-    DeletePgTypeTuple(rdesc);
-    setheapoverride(false);
-    
-    /* ----------------
-     *	delete relation tuple
-     * ----------------
-     */
-    DeletePgRelationTuple(rdesc);
-    
-    /* ----------------
-     *	flush the relation from the relcache
-     * ----------------
-     */
-    RelationIdInvalidateRelationCacheByRelationId(rdesc->rd_id);
-
-    /* ----------------
-     *	unlink the relation and finish up.
-     * ----------------
-     */
-    (void) smgrunlink(rdesc->rd_rel->relsmgr, rdesc);
-    if(rdesc->rd_istemp) {
-        rdesc->rd_tmpunlinked = TRUE;
-    }
-    heap_close(rdesc);
-}
-
-/*
- * heap_destroyr
- *    destroy and close temporary relations
- *
- */
-
-void 
-heap_destroyr(Relation rdesc)
-{
-    ReleaseTmpRelBuffers(rdesc);
-    (void) smgrunlink(rdesc->rd_rel->relsmgr, rdesc);
-    if(rdesc->rd_istemp) {
-        rdesc->rd_tmpunlinked = TRUE;
-    }
-    heap_close(rdesc);
-    RemoveFromTempRelList(rdesc);
-}
-
-
-/**************************************************************
-  functions to deal with the list of temporary relations 
-**************************************************************/
-
-/* --------------
-   InitTempRellist():
-
-   initialize temporary relations list
-   the tempRelList is a list of temporary relations that
-   are created in the course of the transactions
-   they need to be destroyed properly at the end of the transactions
-
-   MODIFIES the global variable tempRels
-
- >> NOTE <<
-
-   malloc is used instead of palloc because we KNOW when we are
-   going to free these things.  Keeps us away from the memory context
-   hairyness
-
-*/
-void
-InitTempRelList()
-{
-    if (tempRels) {
-	free(tempRels->rels);
-	free(tempRels);
-    };
-
-    tempRels = (TempRelList*)malloc(sizeof(TempRelList));
-    tempRels->size = TEMP_REL_LIST_SIZE;
-    tempRels->rels = (Relation*)malloc(sizeof(Relation) * tempRels->size);
-    memset(tempRels->rels, 0, sizeof(Relation) * tempRels->size);
-    tempRels->num = 0;
-}
-
-/*
-   removes a relation from the TempRelList
-
-   MODIFIES the global variable tempRels
-      we don't really remove it, just mark it as NULL
-      and DestroyTempRels will look for NULLs
-*/
-void
-RemoveFromTempRelList(Relation r)
-{
-    int i;
-
-    if (!tempRels)
-	return;
-
-    for (i=0; i<tempRels->num; i++) {
-	if (tempRels->rels[i] == r) {
-	    tempRels->rels[i] = NULL;
-	    break;
-	}
-    }
-}
-
-/*
-   add a temporary relation to the TempRelList
-
-   MODIFIES the global variable tempRels
-*/
-void
-AddToTempRelList(Relation r)
-{
-    if (!tempRels)
-	return;
-
-    if (tempRels->num == tempRels->size) {
-	tempRels->size += TEMP_REL_LIST_SIZE;
-	tempRels->rels = realloc(tempRels->rels, tempRels->size);
-    }
-    tempRels->rels[tempRels->num] = r;
-    tempRels->num++;
-}
-
-/*
-   go through the tempRels list and destroy each of the relations
-*/
-void
-DestroyTempRels()
-{
-    int i;
-    Relation rdesc;
-
-    if (!tempRels)
-	return;
-
-    for (i=0;i<tempRels->num;i++) {
-	rdesc = tempRels->rels[i];
-	/* rdesc may be NULL if it has been removed from the list already */
-	if (rdesc)
-	    heap_destroyr(rdesc);
-    }
-    free(tempRels->rels);
-    free(tempRels);
-    tempRels = NULL;
-}
-
+     *  attributes of the type of the relation we are de
\ No newline at end of file

src/backend/commands/copy.c

@@ -6,7 +6,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.12 1996/11/03 23:57:22 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.13 1996/11/06 06:47:09 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,6 +27,8 @@
 
 #include <utils/builtins.h>
 
+#include <utils/acl.h>
+
 #include <sys/stat.h>
 
 #include <catalog/pg_index.h>

src/backend/commands/defind.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/commands/Attic/defind.c,v 1.6 1996/11/03 23:57:27 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/commands/Attic/defind.c,v 1.7 1996/11/06 06:47:12 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -37,6 +37,7 @@
 #include "optimizer/prep.h"
 #include "optimizer/clauses.h"
 #include "storage/lmgr.h"
+#include "fmgr.h"
 
 #define IsFuncIndex(ATTR_LIST) (((IndexElem*)lfirst(ATTR_LIST))->args!=NULL)
 

src/backend/commands/remove.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.4 1996/11/03 23:57:38 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.5 1996/11/06 06:47:16 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,6 +18,7 @@
 #include "access/heapam.h"
 #include "utils/builtins.h"
 #include "utils/tqual.h"	/* for NowTimeQual */
+#include "utils/syscache.h"
 #include "catalog/catname.h"
 #include "commands/defrem.h"
 
@@ -26,6 +27,7 @@
 #include "catalog/pg_aggregate.h"
 #include "catalog/pg_language.h"
 #include "catalog/pg_operator.h"
+#include "catalog/pg_proc.h"
 #include "parser/catalog_utils.h"
 #include "storage/bufmgr.h"
 #include "fmgr.h"

src/backend/commands/vacuum.c

@@ -7,12 +7,16 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.6 1996/11/03 23:57:40 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.7 1996/11/06 06:47:18 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <sys/file.h>
 #include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
 
 #include "postgres.h"
 #include "utils/portal.h"

src/backend/executor/Makefile

@@ -4,7 +4,7 @@
 #    Makefile for executor
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/executor/Makefile,v 1.1 1996/10/27 09:47:26 bryanh Exp $
+#    $Header: /cvsroot/pgsql/src/backend/executor/Makefile,v 1.2 1996/11/06 06:47:24 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -13,7 +13,6 @@ include ../../Makefile.global
 
 INCLUDE_OPT = -I.. \
               -I../port/$(PORTNAME) \
-              -I../include \
               -I../../include
 
 CFLAGS+=$(INCLUDE_OPT)

src/backend/executor/execAmi.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/executor/execAmi.c,v 1.2 1996/10/31 10:11:21 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/executor/execAmi.c,v 1.3 1996/11/06 06:47:26 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -32,6 +32,7 @@
 
 #include "executor/executor.h"
 #include "storage/smgr.h"
+#include "utils/mcxt.h"
 #include "executor/nodeSeqscan.h"
 #include "executor/nodeIndexscan.h"
 #include "executor/nodeSort.h"
@@ -400,8 +401,8 @@ ExecCreatR(TupleDesc tupType,
 {
     Relation 	relDesc;
 
-    EU4_printf("ExecCreatR: %s numatts=%d type=%d oid=%d\n",
-	       "entering: ", numberAttributes, tupType, relationOid);
+    EU4_printf("ExecCreatR: %s type=%d oid=%d\n",
+	       "entering: ", tupType, relationOid);
     CXT1_printf("ExecCreatR: context is %d\n", CurrentMemoryContext);
     
     relDesc = NULL;

src/backend/executor/execMain.c

@@ -26,23 +26,32 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.7 1996/10/31 10:11:24 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.8 1996/11/06 06:47:32 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
+#include <string.h>
 #include "postgres.h"
+#include "miscadmin.h"
 
 #include "executor/executor.h"
+#include "executor/execdefs.h"
+#include "executor/execdebug.h"
 #include "executor/nodeIndexscan.h"
 #include "utils/builtins.h"
 #include "utils/palloc.h"
 #include "utils/acl.h"
+#include "utils/syscache.h"
 #include "parser/parsetree.h"		/* rt_fetch() */
 #include "storage/bufmgr.h"
 #include "storage/lmgr.h"
+#include "storage/smgr.h"
 #include "commands/async.h"
 /* #include "access/localam.h" */
 #include "optimizer/var.h"
+#include "access/heapam.h"
+#include "catalog/heap.h"
+
 
 
 /* decls for local routines only used within this module */

src/backend/executor/execQual.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.8 1996/10/31 10:11:28 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.9 1996/11/06 06:47:34 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,6 +30,7 @@
  *
  */
 #include "postgres.h"
+#include "fmgr.h"
 
 #include "nodes/primnodes.h"
 #include "nodes/relation.h"
@@ -38,7 +39,9 @@
 
 #include "nodes/memnodes.h"
 #include "catalog/pg_language.h"
+#include "catalog/pg_proc.h"
 #include "executor/executor.h"
+#include "executor/execdebug.h"
 #include "executor/execFlatten.h"
 #include "executor/functions.h"
 #include "access/heapam.h"
@@ -48,6 +51,7 @@
 #include "utils/fcache.h"
 #include "utils/fcache2.h"
 #include "utils/array.h"
+#include "utils/mcxt.h"
 
 /* ----------------
  *	externs and constants

src/backend/executor/execUtils.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.3 1996/10/31 10:11:43 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.4 1996/11/06 06:47:35 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -41,13 +41,20 @@
  */
 
 #include "postgres.h"
+#include "fmgr.h"
 
 #include "executor/executor.h"
+#include "executor/execdebug.h"
 #include "access/itup.h"
+#include "access/heapam.h"
+#include "access/genam.h"
 #include "optimizer/clauses.h"
 #include "utils/palloc.h"
+#include "utils/mcxt.h"
 #include "commands/command.h"
 #include "catalog/index.h"
+#include "catalog/catname.h"
+#include "catalog/pg_proc.h"
 
 /* ----------------------------------------------------------------
  *      global counters for number of tuples processed, retrieved,

src/backend/executor/functions.c

@@ -8,10 +8,11 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.3 1996/10/26 04:13:20 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.4 1996/11/06 06:47:36 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
+#include <string.h>
 #include "postgres.h"
 
 #include "nodes/primnodes.h"
@@ -35,6 +36,7 @@
 #include "access/heapam.h"
 #include "access/xact.h"
 #include "executor/executor.h"
+#include "executor/execdefs.h"
 #include "executor/functions.h"
 
 #undef new

src/backend/executor/nodeAgg.c

@@ -15,7 +15,10 @@
  *
  *-------------------------------------------------------------------------
  */
+#include <string.h>
+
 #include "postgres.h"
+#include "fmgr.h"
 
 #include "access/heapam.h"
 #include "catalog/pg_aggregate.h"
@@ -24,6 +27,7 @@
 #include "executor/nodeAgg.h"
 #include "storage/bufmgr.h"
 #include "utils/palloc.h"
+#include "utils/syscache.h"
 #include "parser/catalog_utils.h"
 
 /*

src/backend/executor/nodeAppend.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.3 1996/10/31 10:11:54 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.4 1996/11/06 06:47:39 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -55,10 +55,13 @@
 #include "postgres.h"
 
 
+#include "access/heapam.h"
 #include "executor/executor.h"
+#include "executor/execdebug.h"
 #include "executor/nodeAppend.h"
 #include "executor/nodeIndexscan.h"
 #include "utils/palloc.h"
+#include "utils/mcxt.h"
 #include "parser/parsetree.h"		/* for rt_store() macro */
 
 /* ----------------------------------------------------------------

src/backend/executor/nodeHash.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/executor/nodeHash.c,v 1.6 1996/10/31 10:12:00 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/executor/nodeHash.c,v 1.7 1996/11/06 06:47:40 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,7 +21,14 @@
 
 #include <stdio.h>	/* for sprintf() */
 #include <math.h>
+#include <string.h>
 #include <sys/file.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#include <unistd.h>
+
 #include "postgres.h"
 
 
@@ -31,6 +38,7 @@
 #include "executor/executor.h"
 #include "executor/nodeHash.h"
 #include "executor/nodeHashjoin.h"
+#include "executor/execdebug.h"
 #include "utils/palloc.h"
 #include "utils/hsearch.h"
 
@@ -845,7 +853,7 @@ static int hjtmpcnt = 0;
 static void
 mk_hj_temp(char *tempname)
 {
-    sprintf(tempname, "HJ%d.%d", getpid(), hjtmpcnt);
+    sprintf(tempname, "HJ%d.%d", (int)getpid(), hjtmpcnt);
     hjtmpcnt = (hjtmpcnt + 1) % 1000;
 }
 

src/backend/executor/nodeHashjoin.c

@@ -7,16 +7,23 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/executor/nodeHashjoin.c,v 1.2 1996/10/31 05:53:35 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/executor/nodeHashjoin.c,v 1.3 1996/11/06 06:47:41 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
+#include <string.h>
 #include <sys/file.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+
 
 #include "postgres.h"
 #include "storage/bufmgr.h"	/* for BLCKSZ */
 #include "storage/fd.h"		/* for SEEK_ */
 #include "executor/executor.h"
+#include "executor/execdebug.h"
 #include "executor/nodeHash.h"
 #include "executor/nodeHashjoin.h"
 

src/backend/executor/nodeIndexscan.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.3 1996/10/31 10:12:05 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.4 1996/11/06 06:47:42 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -31,13 +31,17 @@
 #include "postgres.h"
 
 #include "executor/executor.h"
+#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 "access/skey.h"
+#include "access/heapam.h"
+#include "access/genam.h"
 #include "utils/palloc.h"
+#include "utils/mcxt.h"
 #include "catalog/index.h"
 #include "storage/bufmgr.h"
 #include "storage/lmgr.h"

src/backend/executor/nodeMaterial.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/executor/nodeMaterial.c,v 1.3 1996/10/31 10:12:09 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/executor/nodeMaterial.c,v 1.4 1996/11/06 06:47:44 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,7 +24,9 @@
 #include "executor/executor.h"
 #include "executor/nodeMaterial.h"
 #include "catalog/catalog.h"
+#include "catalog/heap.h"
 #include "optimizer/internal.h" /* for _TEMP_RELATION_ID_ */
+#include "access/heapam.h"
 
 /* ----------------------------------------------------------------
  *   	ExecMaterial

src/backend/executor/nodeMergejoin.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.2 1996/10/31 10:12:11 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.3 1996/11/06 06:47:45 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -78,6 +78,7 @@
 #include "postgres.h"
 
 #include "executor/executor.h"
+#include "executor/execdefs.h"
 #include "executor/nodeMergejoin.h"
 #include "utils/lsyscache.h"
 

src/backend/executor/nodeTee.c

@@ -15,7 +15,7 @@
  *	ExecEndTee
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/executor/Attic/nodeTee.c,v 1.2 1996/10/31 10:12:24 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/executor/Attic/nodeTee.c,v 1.3 1996/11/06 06:47:46 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,7 +25,9 @@
 
 #include "utils/palloc.h"
 #include "utils/relcache.h" 
+#include "utils/mcxt.h"
 #include "storage/bufmgr.h"  /* for IncrBufferRefCount */
+#include "storage/smgr.h"
 #include "optimizer/internal.h"
 #include "executor/executor.h"
 #include "executor/nodeTee.h"

src/backend/lib/bit.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/lib/Attic/bit.c,v 1.2 1996/10/31 10:26:27 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/lib/Attic/bit.c,v 1.3 1996/11/06 06:47:53 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,6 +17,7 @@
  */
 #include "postgres.h"
 
+#include "utils/bit.h"
 #include "utils/memutils.h"	
 
 void

src/backend/libpq/auth.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.5 1996/10/31 10:37:48 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.6 1996/11/06 06:48:06 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -63,6 +63,7 @@
 #include <arpa/inet.h>
 
 #include "postgres.h"
+#include "miscadmin.h"
 
 #include "libpq/auth.h"
 #include "libpq/libpq.h"

src/backend/libpq/be-dumpdata.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-dumpdata.c,v 1.1.1.1 1996/07/09 06:21:30 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-dumpdata.c,v 1.2 1996/11/06 06:48:10 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -29,6 +29,7 @@
  *	puts portals on the stack and the PQ functions remove them.
  *
  */
+#include <string.h>
 #include "postgres.h"
 
 #include "lib/dllist.h"

src/backend/libpq/hba.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.8 1996/11/03 09:24:04 bryanh Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.9 1996/11/06 06:48:12 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,7 +21,7 @@
 #include <arpa/inet.h>
 #include <unistd.h>
 #if defined(sparc_solaris)
-#include "port/inet_aton.h"
+#include "inet_aton.h" /* after I copied it into port/sparc_solaris */
 #endif
 
 #include "postgres.h"

src/backend/parser/analyze.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.11 1996/11/04 04:35:39 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.12 1996/11/06 06:48:20 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,11 +22,13 @@
 #include "nodes/relation.h"
 #include "parse.h"		/* for AND, OR, etc. */
 #include "catalog/pg_type.h"	/* for INT4OID, etc. */
+#include "catalog/pg_proc.h"
 #include "utils/elog.h"
 #include "utils/builtins.h"	/* namecmp(), textout() */
 #include "utils/lsyscache.h"
 #include "utils/palloc.h"
 #include "utils/mcxt.h"
+#include "utils/syscache.h"
 #include "parser/parse_query.h"
 #include "parser/parse_state.h"
 #include "nodes/makefuncs.h"	/* for makeResdom(), etc. */

src/backend/parser/catalog_utils.c

@@ -6,10 +6,11 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/parser/Attic/catalog_utils.c,v 1.6 1996/11/04 04:35:40 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/parser/Attic/catalog_utils.c,v 1.7 1996/11/06 06:48:23 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
+#include <string.h>
 #include "postgres.h"
 
 #include "lib/dllist.h"
@@ -29,6 +30,7 @@
 #include "catalog/pg_inherits.h"
 #include "catalog/pg_operator.h"
 #include "catalog/pg_type.h"
+#include "catalog/pg_proc.h"
 #include "catalog/indexing.h"
 #include "catalog/catname.h"
 

src/backend/parser/parser.c

@@ -6,7 +6,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.4 1996/11/04 04:35:43 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.5 1996/11/06 06:48:26 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,6 +23,7 @@
 #include "utils/exc.h"
 #include "utils/excid.h"
 #include "utils/palloc.h"
+#include "utils/syscache.h"
 #include "catalog/pg_aggregate.h"
 #include "catalog/pg_type.h"
 #include "nodes/primnodes.h"

src/backend/port/sparc_solaris/port.c

@@ -7,11 +7,12 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/port/sparc_solaris/Attic/port.c,v 1.1.1.1 1996/07/09 06:21:45 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/port/sparc_solaris/Attic/port.c,v 1.2 1996/11/06 06:48:35 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <math.h>		/* for pow() prototype */
+#include <stdlib.h>
 
 #include <errno.h>
 #include "rusagestub.h"

src/backend/rewrite/rewriteManip.c

@@ -6,10 +6,11 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.2 1996/07/23 02:23:54 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.3 1996/11/06 06:48:44 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
+#include <string.h>
 #include "postgres.h"
 #include "nodes/pg_list.h"
 #include "utils/elog.h"

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.7 1996/11/04 04:53:24 momjian Exp $
+ *    $Id: fd.c,v 1.8 1996/11/06 06:48:51 scrappy Exp $
  *
  * NOTES:
  *
@@ -44,6 +44,8 @@
 #include <sys/stat.h>
 #include <string.h>
 #include <unistd.h>
+#include <sys/types.h>
+#include <fcntl.h>
 
 #include "c.h"
 #include "miscadmin.h"	/* for DataDir */
@@ -197,6 +199,7 @@ static int FileAccess(File file);
 static File fileNameOpenFile(FileName fileName, int fileFlags, int fileMode);
 static char *filepath(char *filename);
 
+int
 pg_fsync(fd)
 {
     extern int fsyncOff;

src/backend/storage/ipc/ipc.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.6 1996/11/03 05:06:54 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.7 1996/11/06 06:49:01 scrappy Exp $
  *
  * NOTES
  *
@@ -41,6 +41,11 @@
 #include "storage/ipc.h"
 #include "utils/memutils.h"
 
+#if defined(sparc_solaris)
+#include <string.h>
+#include <sys/ipc.h>
+#endif
+
 #if defined(bsd44)
 int UsePrivateMemory = 1;
 #else

src/backend/storage/ipc/ipci.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.2 1996/11/03 05:06:55 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.3 1996/11/06 06:49:03 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,6 +22,11 @@
 #include "storage/lock.h"
 #include "miscadmin.h"		/* for DebugLvl */
 
+#if defined(sparc_solaris)
+#include <string.h>
+#include <sys/ipc.h>
+#endif
+
 /*
  * SystemPortAddressCreateMemoryKey --
  *	Returns a memory key given a port address.

src/backend/storage/ipc/s_lock.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/s_lock.c,v 1.6 1996/11/03 05:06:56 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/s_lock.c,v 1.7 1996/11/06 06:49:04 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -316,7 +316,7 @@ tas_dummy()
  * SPARC (SunOS 4)
  */
 
-#if defined(sparc)
+#if defined(sparc) && !defined(sparc_solaris)
 
 /* if we're using -ansi w/ gcc, use __asm__ instead of asm */
 #if defined(__STRICT_ANSI__)

src/backend/storage/ipc/sinval.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinval.c,v 1.3 1996/11/03 05:06:59 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinval.c,v 1.4 1996/11/06 06:49:09 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,6 +18,7 @@
 
 #include "postgres.h"
 
+#include "storage/backendid.h"
 #include "storage/sinval.h"
 #include "storage/sinvaladt.h"
 #include "storage/spin.h"

src/backend/storage/ipc/sinvaladt.c

@@ -7,14 +7,16 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.2 1996/11/03 05:07:00 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.3 1996/11/06 06:49:10 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
+#include <stdio.h>
 
 #include "postgres.h"
 
 #include "storage/ipc.h"
+#include "storage/backendid.h"
 #include "storage/sinvaladt.h"
 #include "storage/lmgr.h"
 #include "utils/palloc.h"

src/backend/storage/large_object/inv_api.c

@@ -8,13 +8,14 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.3 1996/11/03 05:07:10 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.4 1996/11/06 06:49:17 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <stdio.h>		/* for sprintf() */
 #include <sys/file.h>
 #include "postgres.h"
+#include "miscadmin.h"
 #include "libpq/libpq-fs.h"
 #include "access/genam.h"
 #include "access/heapam.h"

src/backend/storage/lmgr/proc.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.7 1996/11/03 05:07:32 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.8 1996/11/06 06:49:24 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -46,7 +46,7 @@
  *      This is so that we can support more backends. (system-wide semaphore
  *      sets run out pretty fast.)                -ay 4/95
  *
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.7 1996/11/03 05:07:32 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.8 1996/11/06 06:49:24 scrappy Exp $
  */
 #include <sys/time.h>
 #ifndef WIN32
@@ -55,7 +55,13 @@
 #include <string.h>
 #include <sys/types.h>
 
+#if defined(sparc_solaris)
+#include <sys/ipc.h>
+#include <sys/sem.h>
+#endif
+
 #include "postgres.h"
+#include "miscadmin.h"
 #include "libpq/pqsignal.h"	/* substitute for <signal.h> */
 
 #include "access/xact.h"

src/backend/utils/adt/acl.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.3 1996/11/03 06:53:01 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.4 1996/11/06 06:49:34 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,7 +15,6 @@
 #include <string.h>
 #include "postgres.h"
 #include "utils/acl.h"
-#include "access/htup.h"
 #include "catalog/pg_user.h"
 #include "utils/syscache.h"
 #include "utils/palloc.h"

src/backend/utils/adt/arrayfuncs.c

@@ -7,13 +7,11 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.7 1996/11/04 04:19:49 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.8 1996/11/06 06:49:36 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include "config.h"
-
 #include <ctype.h>
 #include <stdio.h>
 
@@ -27,7 +25,6 @@
 #include "utils/memutils.h"
 #include "storage/fd.h"		/* for SEEK_ */
 #include "fmgr.h"
-#include "utils/elog.h"
 #include "utils/array.h"
 
 #include "libpq/libpq-fs.h"

src/backend/utils/adt/arrayutils.c

@@ -7,14 +7,14 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayutils.c,v 1.1.1.1 1996/07/09 06:22:03 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayutils.c,v 1.2 1996/11/06 06:49:41 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #define WEAK_C_OPTIMIZER
 
-#include "c.h"
+#include "postgres.h"
 
 int
 GetOffset(int n, int dim[], int lb[], int indx[])

src/backend/utils/adt/chunk.c

@@ -6,7 +6,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/chunk.c,v 1.1.1.1 1996/07/09 06:22:03 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/chunk.c,v 1.2 1996/11/06 06:49:43 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,7 +21,6 @@
 
 #include "utils/palloc.h"
 #include "fmgr.h"
-#include "utils/elog.h"
 #include "utils/array.h"
 
 #include "optimizer/internal.h"

src/backend/utils/adt/date.c

@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.1.1.1 1996/07/09 06:22:03 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.2 1996/11/06 06:49:44 scrappy Exp $
  *
  * NOTES
  *   This code is actually (almost) unused.
@@ -34,9 +34,7 @@
 #include "miscadmin.h"
 #include "access/xact.h"
 #include "utils/builtins.h"	/* where function declarations go */
-#include "utils/elog.h"
 #include "utils/palloc.h"
-#include "utils/nabstime.h"
 
 #define	TM_YEAR_BASE	1900		/* compatible to UNIX time */
 #define	EPOCH_YEAR	1970		/* compatible to UNIX time */

src/backend/utils/adt/datetimes.c

@@ -7,17 +7,15 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/datetimes.c,v 1.4 1996/10/25 06:02:52 bryanh Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/datetimes.c,v 1.5 1996/11/06 06:49:45 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <stdio.h>		/* for sprintf() */
 #include <string.h>
 
-#include <config.h>
 #include <postgres.h>
 #include <utils/palloc.h>
-#include <utils/elog.h>
 
 /* these things look like structs, but we pass them by value so be careful
    For example, passing an int -> DateADT is not portable! */

src/backend/utils/adt/datum.c

@@ -6,7 +6,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/datum.c,v 1.1.1.1 1996/07/09 06:22:03 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/datum.c,v 1.2 1996/11/06 06:49:47 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -31,7 +31,6 @@
 #include "postgres.h"
 #include "utils/datum.h"
 #include "catalog/pg_type.h"
-#include "utils/elog.h"
 #include "utils/palloc.h"
 
 /*-------------------------------------------------------------------------

src/backend/utils/adt/float.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.6 1996/10/31 10:23:17 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.7 1996/11/06 06:49:48 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -53,7 +53,6 @@
 #include "postgres.h"
 #include "fmgr.h"
 #include "utils/builtins.h"	/* for ftod() prototype */
-#include "utils/elog.h"
 #include "utils/palloc.h"
 
 

src/backend/utils/adt/int.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.1.1.1 1996/07/09 06:22:04 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.2 1996/11/06 06:49:49 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -32,7 +32,6 @@
 #include "postgres.h"
 #include "fmgr.h"
 #include "utils/builtins.h"	/* where the declarations go */
-#include "utils/elog.h"
 #include "utils/palloc.h"
 
 /***************************************************************************** 

src/backend/utils/adt/like.c

@@ -19,7 +19,6 @@
  */
 #include <string.h>
 #include "postgres.h"		/* postgres system include file */
-#include "utils/elog.h"		/* for logging postgres errors */
 #include "utils/palloc.h"
 #include "utils/builtins.h"	/* where the function declarations go */
 
@@ -143,7 +142,7 @@ bool textnlike(struct varlena *s, struct varlena *p)
 }
 
 
-/*  $Revision: 1.2 $
+/*  $Revision: 1.3 $
 **  "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.

src/backend/utils/adt/nabstime.c

@@ -7,18 +7,16 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.5 1996/10/17 23:59:45 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.6 1996/11/06 06:49:51 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
-#include <time.h>
 #include <sys/types.h>
 #include "postgres.h"
 #include "access/xact.h"
-#include "utils/nabstime.h"
 #include "utils/palloc.h"
 
 #define MAXDATEFIELDS 25

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.1.1.1 1996/07/09 06:22:05 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/not_in.c,v 1.2 1996/11/06 06:49:53 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,10 +26,7 @@
 #include <string.h>
 #include "postgres.h"
 #include "access/heapam.h"
-#include "access/htup.h"
 #include "access/relscan.h"
-#include "utils/rel.h"
-#include "utils/elog.h"
 #include "utils/builtins.h"	/* where function decls go */
 
 /* ----------------------------------------------------------------

src/backend/utils/adt/numutils.c

@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.4 1996/10/31 10:23:19 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.5 1996/11/06 06:49:54 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,7 +19,6 @@
 #include <math.h>
 #include "postgres.h"
 #include "utils/builtins.h"		/* where the declarations go */
-#include "utils/elog.h"
 
 int32
 pg_atoi(char *s, int size, int c)

src/backend/utils/adt/oid.c

@@ -7,14 +7,13 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.1.1.1 1996/07/09 06:22:05 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.2 1996/11/06 06:49:55 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 #include "utils/palloc.h"
 #include "utils/builtins.h"	/* where function declarations go */
-#include "utils/elog.h"
 
 /***************************************************************************** 
  *   USER I/O ROUTINES                                                       *

src/backend/utils/adt/oidname.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/oidname.c,v 1.1.1.1 1996/07/09 06:22:05 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/oidname.c,v 1.2 1996/11/06 06:49:56 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,7 +18,6 @@
 #include "postgres.h"
 #include "utils/oidcompos.h"	/* where function declarations go */
 #include "utils/builtins.h"	/* for pg_atoi() */
-#include "utils/elog.h"
 #include "utils/palloc.h"
 
 OidName

src/backend/utils/adt/regexp.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.2 1996/07/09 06:39:19 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.3 1996/11/06 06:49:58 scrappy Exp $
  *
  *      Alistair Crooks added the code for the regex caching
  *	agc - cached the regular expressions used - there's a good chance
@@ -29,7 +29,6 @@
  */
 #include <string.h>
 #include "postgres.h"		/* postgres system include file */
-#include "utils/elog.h"		/* for logging postgres errors */
 #include "utils/palloc.h"
 #include "utils/builtins.h"	/* where the function declarations go */
 

src/backend/utils/adt/regproc.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.1.1.1 1996/07/09 06:22:05 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.2 1996/11/06 06:49:59 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,10 +15,7 @@
 #include "postgres.h"
 #include "access/heapam.h"
 #include "access/relscan.h"
-#include "access/skey.h"
-#include "utils/tqual.h"	/* for NowTimeQual */
 #include "fmgr.h"
-#include "utils/elog.h"
 #include "utils/palloc.h"
 
 #include "catalog/catname.h"

src/backend/utils/adt/sets.c

@@ -9,15 +9,12 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.1.1.1 1996/07/09 06:22:05 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.2 1996/11/06 06:50:01 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <stdio.h>		/* for sprintf() */
 #include "postgres.h"
-#include "utils/elog.h"
-#include "nodes/pg_list.h"          /* for LispValue and List */
-#include "access/htup.h"            /* for HeapTuple */
 #include "access/heapam.h"
 #include "access/relscan.h"
 #include "access/xact.h"

src/backend/utils/adt/tid.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.1.1.1 1996/07/09 06:22:05 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.2 1996/11/06 06:50:05 scrappy Exp $
  *
  * NOTES
  *    input routine largely stolen from boxin().
@@ -17,9 +17,6 @@
 #include <stdio.h>		/* for sprintf() */
 #include <string.h>
 #include "postgres.h"
-#include "storage/block.h"
-#include "storage/off.h"
-#include "storage/itemptr.h"
 #include "storage/bufpage.h"
 
 #include "utils/palloc.h"

src/backend/utils/adt/varchar.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.4 1996/11/04 04:53:37 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.5 1996/11/06 06:50:06 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,7 +15,6 @@
 #include <string.h>
 #include "postgres.h"
 #include "utils/palloc.h"
-#include "utils/elog.h"
 
 /*
  * CHAR() and VARCHAR() types are part of the ANSI SQL standard. CHAR()

src/backend/utils/adt/varlena.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.6 1996/09/23 08:31:01 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.7 1996/11/06 06:50:07 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,7 +15,6 @@
 #include <string.h>
 
 #include "postgres.h"
-#include "utils/elog.h"
 #include "utils/palloc.h"
 #include "utils/builtins.h"	/* where function declarations go */
 

src/backend/utils/misc/Makefile

@@ -4,16 +4,14 @@
 #    Makefile for utils/misc
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/misc/Makefile,v 1.1 1996/11/02 02:06:46 bryanh Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/misc/Makefile,v 1.2 1996/11/06 06:52:23 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR = ../../..
 include ../../../Makefile.global
 
-INCLUDE_OPT =  \
-              -I../../port/$(PORTNAME) \
-              -I../../include \
+INCLUDE_OPT = -I../../port/$(PORTNAME) \
               -I../../../include
 
 CFLAGS += $(INCLUDE_OPT)