Commit68ed296

committed

Don't use 'private' as a parameter name in visible headers ... makes C++

very unhappy ...

1 parente7c8022 commit68ed296Copy full SHA for 68ed296

File tree

+11

-10

lines changed

+11

-10

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.55 2000/11/30 03:11:24 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.56 2000/12/03 17:18:10 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`*`
`@@ -663,7 +663,7 @@ IpcInitKeyAssignment(int port)`
`663`	`663`	`* but we do not fail upon collision with non-Postgres shmem segments.`
`664`	`664`	`*/`
`665`	`665`	`PGShmemHeader*`
`666`		`-IpcMemoryCreate(uint32size,boolprivate,intpermission)`
	`666`	`+IpcMemoryCreate(uint32size,boolmakePrivate,intpermission)`
`667`	`667`	`{`
`668`	`668`	`void*memAddress;`
`669`	`669`	`PGShmemHeader*hdr;`
`@@ -677,7 +677,7 @@ IpcMemoryCreate(uint32 size, bool private, int permission)`
`677`	`677`	`IpcMemoryIdshmid;`
`678`	`678`
`679`	`679`	`/* Special case if creating a private segment --- just malloc() it */`
`680`		`-if (private)`
	`680`	`+if (makePrivate)`
`681`	`681`	`{`
`682`	`682`	`memAddress=PrivateMemoryCreate(size);`
`683`	`683`	`break;`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.36 2000/11/30 01:39:07 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.37 2000/12/03 17:18:10 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -33,11 +33,11 @@`
`33`	`33`	`* It is NEVER called by a backend forked from the postmaster;`
`34`	`34`	`* for such a backend, the shared memory is already ready-to-go.`
`35`	`35`	`*`
`36`		`- * If "private" is true then we only need private memory, not shared`
	`36`	`+ * If "makePrivate" is true then we only need private memory, not shared`
`37`	`37`	`* memory. This is true for a standalone backend, false for a postmaster.`
`38`	`38`	`*/`
`39`	`39`	`void`
`40`		`-CreateSharedMemoryAndSemaphores(boolprivate,intmaxBackends)`
	`40`	`+CreateSharedMemoryAndSemaphores(boolmakePrivate,intmaxBackends)`
`41`	`41`	`{`
`42`	`42`	`intsize;`
`43`	`43`	`PGShmemHeader*seghdr;`
`@@ -62,7 +62,7 @@ CreateSharedMemoryAndSemaphores(bool private, int maxBackends)`
`62`	`62`	`/*`
`63`	`63`	`* Create the shmem segment`
`64`	`64`	`*/`
`65`		`-seghdr=IpcMemoryCreate(size,private,IPCProtection);`
	`65`	`+seghdr=IpcMemoryCreate(size,makePrivate,IPCProtection);`
`66`	`66`
`67`	`67`	`/*`
`68`	`68`	`* First initialize spinlocks --- needed by InitShmemAllocation()`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1996-2000, PostgreSQL, Inc`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`		`- * $Id: ipc.h,v 1.43 2000/11/28 23:27:57 tgl Exp $`
	`10`	`+ * $Id: ipc.h,v 1.44 2000/12/03 17:18:09 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`* Some files that would normally need to include only sys/ipc.h must`
`13`	`13`	`* instead include this file because on Ultrix, sys/ipc.h is not designed`
`@@ -104,10 +104,11 @@ extern void IpcSemaphoreUnlock(IpcSemaphoreId semId, int sem);`
`104`	`104`	`externboolIpcSemaphoreTryLock(IpcSemaphoreIdsemId,intsem);`
`105`	`105`	`externintIpcSemaphoreGetValue(IpcSemaphoreIdsemId,intsem);`
`106`	`106`
`107`		`-externPGShmemHeader*IpcMemoryCreate(uint32size,boolprivate,`
	`107`	`+externPGShmemHeader*IpcMemoryCreate(uint32size,boolmakePrivate,`
`108`	`108`	`intpermission);`
`109`	`109`
`110`	`110`	`/* ipci.c */`
`111`		`-externvoidCreateSharedMemoryAndSemaphores(boolprivate,intmaxBackends);`
	`111`	`+externvoidCreateSharedMemoryAndSemaphores(boolmakePrivate,`
	`112`	`+intmaxBackends);`
`112`	`113`
`113`	`114`	`#endif/* IPC_H */`

Comments

(0)