diff options
| author | Marc G. Fournier <scrappy@hub.org> | 1996-07-31 18:48:16 +0000 |
|---|---|---|
| committer | Marc G. Fournier <scrappy@hub.org> | 1996-07-31 18:48:16 +0000 |
| commit | 7bdd8dcac39a25749b497c71fcbf206b31388061 (patch) | |
| tree | 8c79c19bbcc82f7acce7f8d042df8b41c0eb3f66 /src/backend/optimizer/util | |
| parent | 9c0f89c4a40ba6e9c591cdf805a62d9dd2a5dc2f (diff) | |
| download | postgresql-7bdd8dcac39a25749b497c71fcbf206b31388061.tar.gz | |
This prevent gcc from complaining about casting a short to a char * and
fixes another complaint.
More fixes from Bruce...
Diffstat (limited to 'src/backend/optimizer/util')
| -rw-r--r-- | src/backend/optimizer/util/clauseinfo.c | 4 | ||||
| -rw-r--r-- | src/backend/optimizer/util/plancat.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/optimizer/util/clauseinfo.c b/src/backend/optimizer/util/clauseinfo.c index 81a64d6336..2d648eb360 100644 --- a/src/backend/optimizer/util/clauseinfo.c +++ b/src/backend/optimizer/util/clauseinfo.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/clauseinfo.c,v 1.2 1996/07/22 23:30:57 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/clauseinfo.c,v 1.3 1996/07/31 18:47:06 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -103,7 +103,7 @@ get_relattvals(List *clauseinfo_list, temp = (CInfo *)lfirst(i); get_relattval((Node*)temp->clause, &dummy, &attno, &constval, &flag); - result1 = lappendi(result1, attno); + result1 = lappendi(result1, (int)attno); result2 = lappendi(result2, constval); result3 = lappendi(result3, flag); } diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c index 4dca017f95..2f44c45c7f 100644 --- a/src/backend/optimizer/util/plancat.c +++ b/src/backend/optimizer/util/plancat.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.1.1.1 1996/07/09 06:21:39 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.2 1996/07/31 18:47:08 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -324,7 +324,7 @@ restriction_selectivity(Oid functionObjectId, result = (float64) fmgr(functionObjectId, (char *) operatorObjectId, (char *) relationObjectId, - (char *) attributeNumber, + (char *) (int)attributeNumber, (char *) constValue, (char *) constFlag, NULL); @@ -363,9 +363,9 @@ join_selectivity (Oid functionObjectId, result = (float64) fmgr(functionObjectId, (char *) operatorObjectId, (char *) relationObjectId1, - (char *) attributeNumber1, + (char *) (int)attributeNumber1, (char *) relationObjectId2, - (char *) attributeNumber2, + (char *) (int)attributeNumber2, NULL); if (!PointerIsValid(result)) elog(WARN, "JoinClauseSelectivity: bad pointer"); |