aboutsummaryrefslogtreecommitdiff
path: root/src/include/storage/ipc.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/include/storage/ipc.h')
-rw-r--r--src/include/storage/ipc.h29
1 files changed, 3 insertions, 26 deletions
diff --git a/src/include/storage/ipc.h b/src/include/storage/ipc.h
index 8ce1a845930..dae16748d01 100644
--- a/src/include/storage/ipc.h
+++ b/src/include/storage/ipc.h
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: ipc.h,v 1.50 2001/06/27 23:31:39 tgl Exp $
+ * $Id: ipc.h,v 1.51 2001/09/29 04:02:26 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
@@ -30,9 +30,9 @@ union semun
struct semid_ds *buf;
unsigned short *array;
};
-
#endif
+
/* generic IPC definitions */
#define IPCProtection (0600) /* access/modify by user only */
@@ -51,7 +51,7 @@ typedef int IpcSemaphoreId; /* semaphore ID returned by semget(2) */
typedef uint32 IpcMemoryKey; /* shared memory key passed to shmget(2) */
typedef int IpcMemoryId; /* shared memory ID returned by shmget(2) */
-typedef struct /* standard header for all Postgres shmem */
+typedef struct PGShmemHeader /* standard header for all Postgres shmem */
{
int32 magic; /* magic # to identify Postgres segments */
#define PGShmemMagic 679834892
@@ -61,29 +61,6 @@ typedef struct /* standard header for all Postgres shmem */
} PGShmemHeader;
-/* spinlock definitions */
-
-typedef enum _LockId_
-{
- BUFMGRLOCKID,
- OIDGENLOCKID,
- XIDGENLOCKID,
- CNTLFILELOCKID,
- SHMEMLOCKID,
- SHMEMINDEXLOCKID,
- LOCKMGRLOCKID,
- SINVALLOCKID,
- PROCSTRUCTLOCKID,
- FREESPACELOCKID,
-
-#ifdef STABLE_MEMORY_STORAGE
- MMCACHELOCKID,
-#endif
-
- MAX_SPINS /* must be last item! */
-} _LockId_;
-
-
/* ipc.c */
extern bool proc_exit_inprogress;