Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit3e87138

Browse files
committed
From: Darren King <aixssd!darrenk@abs.net>
Subject: [PATCHES] Re: [PORTS] AIX 6.1 fixes...Here are the patches for the two things that wouldn't make it thru the AIXcompiler. The geo_ops.c change is harmless I believe. The nbtcompare.c patchfixes me, but I don't know about any other ports. Maybe wait on that oneuntil Vadim decides what to do about the unsigned vs signed chars varlenaissue.
1 parentfce2c41 commit3e87138

File tree

3 files changed

+20
-2699
lines changed

3 files changed

+20
-2699
lines changed

‎src/backend/access/nbtree/nbtcompare.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* 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 $
1111
*
1212
* NOTES
1313
*These functions are stored in pg_amproc. For each operator class
@@ -134,10 +134,10 @@ btnamecmp(NameData *a, NameData *b)
134134
int32
135135
bttextcmp(structvarlena*a,structvarlena*b)
136136
{
137-
unsignedchar*ap,*bp;
138137
intres;
139138

140139
#ifdefUSE_LOCALE
140+
unsignedchar*ap,*bp;
141141
intla=VARSIZE(a)-VARHDRSZ;
142142
intlb=VARSIZE(b)-VARHDRSZ;
143143

@@ -155,6 +155,7 @@ bttextcmp(struct varlena *a, struct varlena *b)
155155
pfree (bp);
156156

157157
#else
158+
char*ap,*bp;
158159
intlen=VARSIZE(a);
159160

160161
/* len is the length of the shorter of the two strings */

‎src/backend/utils/adt/geo_ops.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.7 1997/05/19 03:49:39 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.8 1997/05/22 00:07:21 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -986,7 +986,8 @@ path_close(PATH *path)
986986
{
987987
PATH*result;
988988

989-
if (PointerIsValid((char*)(result=path_copy(path))))
989+
result=path_copy(path);
990+
if (PointerIsValid((char*)result))
990991
result->closed= TRUE;
991992

992993
return(result);
@@ -997,7 +998,8 @@ path_open(PATH *path)
997998
{
998999
PATH*result;
9991000

1000-
if (PointerIsValid((char*)(result=path_copy(path))))
1001+
result=path_copy(path);
1002+
if (PointerIsValid((char*)result))
10011003
result->closed= FALSE;
10021004

10031005
return(result);
@@ -2639,7 +2641,7 @@ poly_path(POLYGON *poly)
26392641
*
26402642
*
26412643
* IDENTIFICATION
2642-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.7 1997/05/19 03:49:39 scrappy Exp $
2644+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.8 1997/05/22 00:07:21 scrappy Exp $
26432645
*
26442646
*-------------------------------------------------------------------------
26452647
*/

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp