diff options
author | Bruce Momjian <bruce@momjian.us> | 2000-11-16 05:51:07 +0000 |
---|---|---|
committer | Bruce Momjian <bruce@momjian.us> | 2000-11-16 05:51:07 +0000 |
commit | 312063c97be346c3ce01faff021e9bff0464fa5c (patch) | |
tree | a4b33aa5242b3e1172379308804f3b06a89857bc /src/backend/nodes/outfuncs.c | |
parent | 580d2bc60f0e225e3fffc4da81039cf28e249749 (diff) | |
download | postgresql-312063c97be346c3ce01faff021e9bff0464fa5c.tar.gz postgresql-312063c97be346c3ce01faff021e9bff0464fa5c.zip |
Make pgsql compile on FreeBSD-alpha.
Context diff this time.
Remove -m486 compile args for FreeBSD-i386, compile -O2 on i386.
Compile with only -O on alpha for codegen safety.
Make the port use the TEST_AND_SET for alpha and i386 on FreeBSD.
Fix a lot of bogus string formats for outputting pointers (cast to int
and %u/%x replaced with no cast and %p), and 'Size'(size_t) are now
cast to 'unsigned long' and output with %lu/
Remove an unused variable.
Alfred Perlstein
Diffstat (limited to 'src/backend/nodes/outfuncs.c')
-rw-r--r-- | src/backend/nodes/outfuncs.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c index d7137f10ace..db318a1b312 100644 --- a/src/backend/nodes/outfuncs.c +++ b/src/backend/nodes/outfuncs.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.132 2000/11/12 00:36:57 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.133 2000/11/16 05:51:00 momjian Exp $ * * NOTES * Every (plan) node in POSTGRES has an associated "out" routine which @@ -688,8 +688,8 @@ _outFjoin(StringInfo str, Fjoin *node) appendStringInfo(str, " :innerNode "); _outNode(str, node->fj_innerNode); - appendStringInfo(str, " :results @ 0x%x :alwaysdone", - (int) node->fj_results); + appendStringInfo(str, " :results @ 0x%p :alwaysdone", + node->fj_results); for (i = 0; i < node->fj_nNodes; i++) appendStringInfo(str, (node->fj_alwaysDone[i]) ? "true" : "false"); @@ -1284,15 +1284,15 @@ static void _outStream(StringInfo str, Stream *node) { appendStringInfo(str, - " STREAM :pathptr @ 0x%x :cinfo @ 0x%x :clausetype %d :upstream @ 0x%x ", - (int) node->pathptr, - (int) node->cinfo, - (int) node->clausetype, - (int) node->upstream); + " STREAM :pathptr @ %p :cinfo @ %p :clausetype %p :upstream @ %p ", + node->pathptr, + node->cinfo, + node->clausetype, + node->upstream); appendStringInfo(str, - " :downstream @ 0x%x :groupup %d :groupcost %f :groupsel %f ", - (int) node->downstream, + " :downstream @ %p :groupup %d :groupcost %f :groupsel %f ", + node->downstream, node->groupup, node->groupcost, node->groupsel); |