Use proper types so it compiles on DEC C89. Thanks Erik Bertelson.

diff --git a/src/backend/tcop/dest.c b/src/backend/tcop/dest.c
index 82e847812e6870a6c03de41c7a52bdc6d65f12d6..78142fcb3b9f4327b4f261733eee953ab19ceadc 100644 (file)
--- 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.3 1996/11/10 03:02:42 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.4 1997/01/08 08:36:31 bryanh Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -45,12 +45,12 @@
  *     output functions
  * ----------------
  */
-void
-donothing(List *tuple, List *attrdesc)
+static void
+donothing(HeapTuple tuple, TupleDesc attrdesc)
 {
 }
 
-void (*DestToFunction(CommandDest dest))()
+void (*DestToFunction(CommandDest dest))(HeapTuple, TupleDesc)
 {
     switch (dest) {
     case RemoteInternal:

diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
index 4e3d4e2674eb74f89e59f6b93f76ee9305a2d59e..655a6a74fa03f1bb8748b2167144b135433e8588 100644 (file)
--- 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.8 1996/11/08 05:59:51 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.9 1997/01/08 08:38:59 bryanh Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -297,8 +297,8 @@ text_lt(struct varlena *arg1, struct varlena *arg2)
     if (arg1 == NULL || arg2 == NULL)
        return((int32) 0);
     
-    a1p = VARDATA(arg1);
-    a2p = VARDATA(arg2);
+    a1p = (unsigned char *)VARDATA(arg1);
+    a2p = (unsigned char *)VARDATA(arg2);
     
     if ((len = arg1->vl_len) > arg2->vl_len)
        len = arg2->vl_len;
@@ -328,8 +328,8 @@ text_le(struct varlena *arg1, struct varlena *arg2)
     if (arg1 == NULL || arg2 == NULL)
        return((int32) 0);
     
-    a1p = VARDATA(arg1);
-    a2p = VARDATA(arg2);
+    a1p = (unsigned char *)VARDATA(arg1);
+    a2p = (unsigned char *)VARDATA(arg2);
     
     if ((len = arg1->vl_len) > arg2->vl_len)
        len = arg2->vl_len;

diff --git a/src/include/tcop/dest.h b/src/include/tcop/dest.h
index 47cbd225cbb8792d7b62fa319ea1cae08a0249c3..9e2f7688ec2a11f563cc66ec6e1b1855f2c12e0b 100644 (file)
--- a/src/include/tcop/dest.h
+++ b/src/include/tcop/dest.h
@@ -26,7 +26,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dest.h,v 1.4 1996/11/10 03:06:08 momjian Exp $
+ * $Id: dest.h,v 1.5 1997/01/08 08:39:10 bryanh Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -61,7 +61,6 @@ typedef struct AttrInfo {
 } AttrInfo;
 */
 
-extern void donothing(List *tuple, List *attrdesc);
 extern void (*DestToFunction(CommandDest dest))();
 extern void EndCommand(char *commandTag, CommandDest dest);
 extern void SendCopyBegin(void);