7 files changed, 16 insertions, 29 deletions
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
index e6494ea1349..0556083ff1b 100644
--- a/src/backend/utils/adt/acl.c
+++ b/src/backend/utils/adt/acl.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.5 1996/11/06 10:30:36 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.6 1996/11/10 03:03:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -325,7 +325,7 @@ aclownerdefault(AclId ownerid)
 }
 
 Acl *
-acldefault()
+acldefault(void)
 {
     Acl *acl;
     AclItem *aip;
diff --git a/src/backend/utils/adt/arrayutils.c b/src/backend/utils/adt/arrayutils.c
index 5f175df0319..fce0b0ddd57 100644
--- a/src/backend/utils/adt/arrayutils.c
+++ b/src/backend/utils/adt/arrayutils.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayutils.c,v 1.2 1996/11/06 06:49:41 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayutils.c,v 1.3 1996/11/10 03:03:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,6 +16,8 @@
 
 #include "postgres.h"
 
+#include "utils/array.h"
+
 int
 GetOffset(int n, int dim[], int lb[], int indx[])
 {                                              
diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c
index 20a3aeeddb8..80dbae8dd0a 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.3 1996/11/06 10:30:44 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.4 1996/11/10 03:03:05 momjian Exp $
  *
  * NOTES
  *   This code is actually (almost) unused.
@@ -852,7 +852,7 @@ static int istinterval(char *i_string,
  *     time with precision up to microsecs.)              - ay 3/95
  */
 text *
-timeofday()
+timeofday(void)
 {
 
 #ifndef WIN32
diff --git a/src/backend/utils/adt/datetimes.c b/src/backend/utils/adt/datetimes.c
index 06f2e373d72..f38b2c1171a 100644
--- a/src/backend/utils/adt/datetimes.c
+++ b/src/backend/utils/adt/datetimes.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/datetimes.c,v 1.5 1996/11/06 06:49:45 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/datetimes.c,v 1.6 1996/11/10 03:03:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,22 +15,8 @@
 #include <string.h>
 
 #include <postgres.h>
-#include <utils/palloc.h>
-
-/* these things look like structs, but we pass them by value so be careful
-   For example, passing an int -> DateADT is not portable! */
-typedef struct DateADT {
-    char	day;
-    char	month;
-    short	year;
-} DateADT;
-
-typedef struct TimeADT {
-    short	hr;
-    short	min;
-    float	sec;
-} TimeADT;
-
+#include <utils/builtins.h>
+#include <utils/datetime.h>
 
 static int	day_tab[2][12] = {
 	{31,28,31,30,31,30,31,31,30,31,30,31},
diff --git a/src/backend/utils/adt/geo-selfuncs.c b/src/backend/utils/adt/geo-selfuncs.c
index a816e738f53..77454064cd6 100644
--- a/src/backend/utils/adt/geo-selfuncs.c
+++ b/src/backend/utils/adt/geo-selfuncs.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/geo-selfuncs.c,v 1.1.1.1 1996/07/09 06:22:04 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/geo-selfuncs.c,v 1.2 1996/11/10 03:03:13 momjian Exp $
  *
  *	XXX These are totally bogus.
  *
@@ -19,6 +19,7 @@
 #include "access/attnum.h"
 #include "utils/geo-decls.h"	/* where function declarations go */
 #include "utils/palloc.h"
+#include "utils/builtins.h"
 
 float64
 areasel(Oid opid, 
diff --git a/src/backend/utils/adt/like.c b/src/backend/utils/adt/like.c
index 127d59a2812..2e279317b95 100644
--- a/src/backend/utils/adt/like.c
+++ b/src/backend/utils/adt/like.c
@@ -22,8 +22,6 @@
 #include "utils/palloc.h"
 #include "utils/builtins.h"	/* where the function declarations go */
 
-int like(char *text, char *p);
-
 /*
  *  interface routines called by the function manager
  */
@@ -142,7 +140,7 @@ bool textnlike(struct varlena *s, struct varlena *p)
 }
 
 
-/*  $Revision: 1.3 $
+/*  $Revision: 1.4 $
 **  "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/varchar.c b/src/backend/utils/adt/varchar.c
index 5c5531882ed..4a86ced5a08 100644
--- a/src/backend/utils/adt/varchar.c
+++ b/src/backend/utils/adt/varchar.c
@@ -1,20 +1,20 @@
 /*-------------------------------------------------------------------------
  *
- * char.c--
+ * varchar.c--
  *    Functions for the built-in type char() and varchar().
  *
  * Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.5 1996/11/06 06:50:06 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.6 1996/11/10 03:03:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <stdio.h>		/* for sprintf() */
 #include <string.h>
 #include "postgres.h"
-#include "utils/palloc.h"
+#include "utils/builtins.h"
 
 /*
  * CHAR() and VARCHAR() types are part of the ANSI SQL standard. CHAR()