Unixware patches from Billy G. Allie.

diff --git a/src/include/c.h b/src/include/c.h
index 02d469b..ffbf750 100644 (file)
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: c.h,v 1.45 1998/09/01 04:33:57 momjian Exp $
+ * $Id: c.h,v 1.46 1998/10/04 15:38:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -61,8 +61,9 @@
 #define false  ((char) 0)
 #define true   ((char) 1)
 #ifndef __cplusplus
+#ifndef bool
 typedef char bool;
-
+#endif   /* ndef bool */
 #endif  /* not C++ */
 typedef bool *BoolPtr;
 

diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
index b414d15..8a14cc7 100644 (file)
--- a/src/pl/plpgsql/src/pl_exec.c
+++ b/src/pl/plpgsql/src/pl_exec.c
@@ -3,7 +3,7 @@
  *                       procedural language
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.3 1998/09/01 04:40:22 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.4 1998/10/04 15:38:57 momjian Exp $
  *
  *       This software is copyrighted by Jan Wieck - Hamburg.
  *
@@ -1243,9 +1243,9 @@ exec_stmt_fori(PLpgSQL_execstate * estate, PLpgSQL_stmt_fori * stmt)
                 * ----------
                 */
                if (stmt->reverse)
-                       ((int4) (var->value))--;
+                       (int4)var->value--;
                else
-                       ((int4) (var->value))++;
+                       (int4)var->value++;
        }
 
        return PLPGSQL_RC_OK;

diff --git a/src/test/regress/checkresults b/src/test/regress/checkresults
index 6fffa08..39783cf 100755 (executable)
--- a/src/test/regress/checkresults
+++ b/src/test/regress/checkresults
@@ -7,7 +7,7 @@
 for file in `cat "$@" | grep 'failed$' | cut -d " " -f 1`
 do
        echo "======   $file   ======"
-       diff -uw expected/$file.out results
+       diff -w expected/$file.out results
 done