From 5e2b99db95edea2a23ecdd62b3711a3feb3a28b9 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Mon, 1 Dec 2003 22:15:38 +0000 Subject: Avoid assuming that type key_t is 32 bits, since it reportedly isn't on 64-bit Solaris. Use a non-system-dependent datatype for UsedShmemSegID, namely unsigned long (which we were already assuming could hold a shmem key anyway, cf RecordSharedMemoryInLockFile). --- src/backend/tcop/postgres.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/backend/tcop/postgres.c') diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 0cd91e8fd95..0162cdc2d4b 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.378 2003/11/29 21:40:43 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.379 2003/12/01 22:15:37 tgl Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -2282,7 +2282,8 @@ PostgresMain(int argc, char *argv[], const char *username) * global or static, * when fork */ - sscanf(optarg, "%d,%d,%d,%p,", &MyProcPort->sock, &PMcanAcceptConnections, + sscanf(optarg, "%d,%d,%lu,%p,", + &MyProcPort->sock, &PMcanAcceptConnections, &UsedShmemSegID, &UsedShmemSegAddr); /* Grab dbname as last param */ for (i = 0, p = optarg - 1; i < 4 && p; i++) -- cgit v1.2.3