summaryrefslogtreecommitdiff
path: root/src/backend/bootstrap/bootstrap.c
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2003-12-01 22:15:38 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2003-12-01 22:15:38 +0000
commit5e2b99db95edea2a23ecdd62b3711a3feb3a28b9 (patch)
treeb2df40aa0867cbf2bc1fec6b70b400ab29bd6a5b /src/backend/bootstrap/bootstrap.c
parent35ddc2edeea919bad940b3e0ca8619688adba4b1 (diff)
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).
Diffstat (limited to 'src/backend/bootstrap/bootstrap.c')
-rw-r--r--src/backend/bootstrap/bootstrap.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index 5be360040ad..d23eb91735f 100644
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@@ -8,7 +8,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.168 2003/11/29 19:51:41 pgsql Exp $
+ * $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.169 2003/12/01 22:15:37 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -290,7 +290,9 @@ BootstrapMain(int argc, char *argv[])
#ifdef EXEC_BACKEND
char *p;
- sscanf(optarg, "%d,%p,", &UsedShmemSegID, &UsedShmemSegAddr);
+ sscanf(optarg, "%lu,%p,",
+ &UsedShmemSegID,
+ &UsedShmemSegAddr);
p = strchr(optarg, ',');
if (p)
p = strchr(p + 1, ',');