2 files changed, 9 insertions, 6 deletions
diff --git a/src/backend/access/nbtree/nbtcompare.c b/src/backend/access/nbtree/nbtcompare.c
index c1174f19e63..6729117960f 100644
--- a/src/backend/access/nbtree/nbtcompare.c
+++ b/src/backend/access/nbtree/nbtcompare.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.8 1997/04/18 02:48:05 vadim Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.9 1997/05/22 00:07:15 scrappy Exp $
  *
  *  NOTES
  *	These functions are stored in pg_amproc.  For each operator class
@@ -134,10 +134,10 @@ btnamecmp(NameData *a, NameData *b)
 int32
 bttextcmp(struct varlena *a, struct varlena *b)
 {
-    unsigned char *ap, *bp;
     int res;
 
 #ifdef USE_LOCALE
+    unsigned char *ap, *bp;
     int la = VARSIZE(a) - VARHDRSZ;
     int lb = VARSIZE(b) - VARHDRSZ;
     
@@ -155,6 +155,7 @@ bttextcmp(struct varlena *a, struct varlena *b)
     pfree (bp);
 
 #else
+    char *ap, *bp;
     int len = VARSIZE(a);
     
     /* len is the length of the shorter of the two strings */
diff --git a/src/backend/utils/adt/geo_ops.c b/src/backend/utils/adt/geo_ops.c
index 4b5c3eaf6d3..85b329b3a62 100644
--- a/src/backend/utils/adt/geo_ops.c
+++ b/src/backend/utils/adt/geo_ops.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.7 1997/05/19 03:49:39 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.8 1997/05/22 00:07:21 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -986,7 +986,8 @@ path_close(PATH *path)
 {
     PATH *result;
 
-    if (PointerIsValid((char *)(result = path_copy(path))))
+    result = path_copy(path);
+    if (PointerIsValid((char *)result))
 	result->closed = TRUE;
 
     return(result);
@@ -997,7 +998,8 @@ path_open(PATH *path)
 {
     PATH *result;
 
-    if (PointerIsValid((char *)(result = path_copy(path))))
+    result = path_copy(path);
+    if (PointerIsValid((char *)result))
 	result->closed = FALSE;
 
     return(result);
@@ -2639,7 +2641,7 @@ poly_path(POLYGON *poly)
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.7 1997/05/19 03:49:39 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.8 1997/05/22 00:07:21 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */