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/access/nbtree/nbtinsert.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/access/nbtree/nbtinsert.c')
| -rw-r--r-- | src/backend/access/nbtree/nbtinsert.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c index 4b92f2f5611..6d287fb79bc 100644 --- a/src/backend/access/nbtree/nbtinsert.c +++ b/src/backend/access/nbtree/nbtinsert.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.67 2000/10/21 15:43:18 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.68 2000/11/16 05:50:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -348,8 +348,8 @@ _bt_insertonpg(Relation rel, * itemsz doesn't include the ItemId. */ if (itemsz > (PageGetPageSize(page) - sizeof(PageHeaderData) - MAXALIGN(sizeof(BTPageOpaqueData))) / 3 - sizeof(ItemIdData)) - elog(ERROR, "btree: index item size %u exceeds maximum %lu", - itemsz, + elog(ERROR, "btree: index item size %lu exceeds maximum %lu", + (unsigned long)itemsz, (PageGetPageSize(page) - sizeof(PageHeaderData) - MAXALIGN(sizeof(BTPageOpaqueData))) /3 - sizeof(ItemIdData)); /* |