From: Darren King <aixssd!darrenk@abs.net>

scrappy · scrappy · commit 3e871388b5f6 · 1997-05-22T00:07:30.000Z
Subject: [PATCHES] Re: [PORTS] AIX 6.1 fixes...

Here are the patches for the two things that wouldn't make it thru the AIX
compiler.  The geo_ops.c change is harmless I believe.  The nbtcompare.c patch
fixes me, but I don't know about any other ports.  Maybe wait on that one
until Vadim decides what to do about the unsigned vs signed chars varlena
issue.
diff --git 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
@@ -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 $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/test/regress/expected/misc.out b/src/test/regress/expected/misc.out

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.8 1997/04/18 02:48:05 vadim Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.9 1997/05/22 00:07:15 scrappy Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`* These functions are stored in pg_amproc. For each operator class`
`@@ -134,10 +134,10 @@ btnamecmp(NameData a, NameData b)`
`134`	`134`	`int32`
`135`	`135`	`bttextcmp(struct varlena a, struct varlena b)`
`136`	`136`	`{`
`137`		`- unsigned char ap, bp;`
`138`	`137`	`int res;`
`139`	`138`
`140`	`139`	`#ifdef USE_LOCALE`
	`140`	`+ unsigned char ap, bp;`
`141`	`141`	`int la = VARSIZE(a) - VARHDRSZ;`
`142`	`142`	`int lb = VARSIZE(b) - VARHDRSZ;`
`143`	`143`
`@@ -155,6 +155,7 @@ bttextcmp(struct varlena a, struct varlena b)`
`155`	`155`	`pfree (bp);`
`156`	`156`
`157`	`157`	`#else`
	`158`	`+ char ap, bp;`
`158`	`159`	`int len = VARSIZE(a);`
`159`	`160`
`160`	`161`	`/* len is the length of the shorter of the two strings */`