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

very unhappy ...

diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c
index 7b3dd4b3d50d52c50a3f38abd0e8f3059241796a..804411bb960e40b3d97453e1e6696d6b40b78b24 100644 (file)
--- a/src/backend/storage/ipc/ipc.c
+++ b/src/backend/storage/ipc/ipc.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.55 2000/11/30 03:11:24 tgl Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.56 2000/12/03 17:18:10 tgl Exp $
  *
  * NOTES
  *
@@ -663,7 +663,7 @@ IpcInitKeyAssignment(int port)
  * but we do not fail upon collision with non-Postgres shmem segments.
  */
 PGShmemHeader *
-IpcMemoryCreate(uint32 size, bool private, int permission)
+IpcMemoryCreate(uint32 size, bool makePrivate, int permission)
 {
        void   *memAddress;
        PGShmemHeader *hdr;
@@ -677,7 +677,7 @@ IpcMemoryCreate(uint32 size, bool private, int permission)
                IpcMemoryId shmid;
 
                /* Special case if creating a private segment --- just malloc() it */
-               if (private)
+               if (makePrivate)
                {
                        memAddress = PrivateMemoryCreate(size);
                        break;

diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c
index a813a530bfedfd5cdf8cee00a686bb89ef963aff..60e4d16cc04df18a96f21bc6b97ed64c01d51041 100644 (file)
--- a/src/backend/storage/ipc/ipci.c
+++ b/src/backend/storage/ipc/ipci.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.36 2000/11/30 01:39:07 tgl Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.37 2000/12/03 17:18:10 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -33,11 +33,11 @@
  * It is NEVER called by a backend forked from the postmaster;
  * for such a backend, the shared memory is already ready-to-go.
  *
- * If "private" is true then we only need private memory, not shared
+ * If "makePrivate" is true then we only need private memory, not shared
  * memory.  This is true for a standalone backend, false for a postmaster.
  */
 void
-CreateSharedMemoryAndSemaphores(bool private, int maxBackends)
+CreateSharedMemoryAndSemaphores(bool makePrivate, int maxBackends)
 {
        int                     size;
        PGShmemHeader *seghdr;
@@ -62,7 +62,7 @@ CreateSharedMemoryAndSemaphores(bool private, int maxBackends)
        /*
         * Create the shmem segment
         */
-       seghdr = IpcMemoryCreate(size, private, IPCProtection);
+       seghdr = IpcMemoryCreate(size, makePrivate, IPCProtection);
 
        /*
         * First initialize spinlocks --- needed by InitShmemAllocation()

diff --git a/src/include/storage/ipc.h b/src/include/storage/ipc.h
index b633297d5f675b25ea65e530b554168d51b4d60b..55aa29635875b8f830a8323fca3b69fa73f74548 100644 (file)
--- a/src/include/storage/ipc.h
+++ b/src/include/storage/ipc.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: ipc.h,v 1.43 2000/11/28 23:27:57 tgl Exp $
+ * $Id: ipc.h,v 1.44 2000/12/03 17:18:09 tgl Exp $
  *
  * Some files that would normally need to include only sys/ipc.h must
  * instead include this file because on Ultrix, sys/ipc.h is not designed
@@ -104,10 +104,11 @@ extern void IpcSemaphoreUnlock(IpcSemaphoreId semId, int sem);
 extern bool IpcSemaphoreTryLock(IpcSemaphoreId semId, int sem);
 extern int     IpcSemaphoreGetValue(IpcSemaphoreId semId, int sem);
 
-extern PGShmemHeader *IpcMemoryCreate(uint32 size, bool private,
+extern PGShmemHeader *IpcMemoryCreate(uint32 size, bool makePrivate,
                                                                          int permission);
 
 /* ipci.c */
-extern void CreateSharedMemoryAndSemaphores(bool private, int maxBackends);
+extern void CreateSharedMemoryAndSemaphores(bool makePrivate,
+                                                                                       int maxBackends);
 
 #endif  /* IPC_H */