Add Win32 shmem/sema prototypes.

bmomjian · bmomjian · commit 20ead395c749 · 2003-04-24T21:23:01.000Z
diff --git a/src/backend/port/sysv_shmem.c b/src/backend/port/sysv_shmem.c
@@ -10,7 +10,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/port/sysv_shmem.c,v 1.5 2003/03/25 16:15:44 petere Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/port/sysv_shmem.c,v 1.6 2003/04/24 21:23:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,6 +30,10 @@
 #include <kernel/OS.h>
 #endif
 
+#ifdef WIN32
+#include "win32/shmem.h"
+#endif
+
 #include "miscadmin.h"
 #include "storage/ipc.h"
 #include "storage/pg_shmem.h"
diff --git a/src/backend/port/win32/sema.c b/src/backend/port/win32/sema.c
@@ -1,6 +1,6 @@
 /*-------------------------------------------------------------------------
  *
- * sem.c
+ * sema.c
  *	  Microsoft Windows Win32 Semaphores Emulation
  *
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
@@ -10,6 +10,7 @@
 
 #include "postgres.h"
 #include "storage/shmem.h"
+#include "sema.h"
 
 #include <errno.h>
 
diff --git a/src/backend/port/win32/shmem.c b/src/backend/port/win32/shmem.c
@@ -1,6 +1,6 @@
 /*-------------------------------------------------------------------------
  *
- * shm.c
+ * shmem.c
  *	  Microsoft Windows Win32 Shared Memory Emulation
  *
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
@@ -9,7 +9,6 @@
  */
 
 #include "postgres.h"
-#include "windows.h"
 
 #include <stdio.h>
 #include <errno.h>
diff --git a/src/include/port/win32.h b/src/include/port/win32.h
@@ -1,4 +1,4 @@
-/* $Header: /cvsroot/pgsql/src/include/port/win32.h,v 1.7 2003/04/18 01:03:42 momjian Exp $ */
+/* $Header: /cvsroot/pgsql/src/include/port/win32.h,v 1.8 2003/04/24 21:23:01 momjian Exp $ */
 
 #include <port/win32defs.h>
 
@@ -32,6 +32,56 @@
 
 #endif
 
+/*
+ *	IPC defines
+ */
+#define IPC_RMID 256
+#define IPC_CREAT 512
+#define IPC_EXCL 1024
+#define IPC_PRIVATE 234564
+#define IPC_NOWAIT	2048
+#define IPC_STAT 4096
+
+
+/*
+ *	Shared memory
+ */
+struct shmid_ds
+{
+	int		dummy;
+	int		shm_nattch;
+};
+
+int   shmdt(const void *shmaddr);
+void* shmat(int memId, void* shmaddr, int flag);
+int   shmctl(int shmid, int flag, struct shmid_ds * dummy);
+int   shmget(int memKey, int size, int flag);
+
+
+/*
+ *	Semaphores
+ */
+union semun
+{
+	int 		val;
+	struct semid_ds *buf;
+	unsigned short *array;
+};
+
+struct sembuf
+{
+	int 		sem_flg;
+	int 		sem_op;
+	int 		sem_num;
+};
+
+int	  semctl(int semId, int semNum, int flag, union semun);
+int	  semget(int semKey, int semNum, int flags);
+int	  semop(int semId, struct sembuf * sops, int flag);
+
+
+/* FROM SRA */
+
 /*
  * Supplement to <sys/types.h>.
  */

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/*-------------------------------------------------------------------------`
`2`	`2`	`*`
`3`		`- * sem.c`
	`3`	`+ * sema.c`
`4`	`4`	`* Microsoft Windows Win32 Semaphores Emulation`
`5`	`5`	`*`
`6`	`6`	`* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group`
`@@ -10,6 +10,7 @@`
`10`	`10`
`11`	`11`	`#include "postgres.h"`
`12`	`12`	`#include "storage/shmem.h"`
	`13`	`+#include "sema.h"`
`13`	`14`
`14`	`15`	`#include <errno.h>`
`15`	`16`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/*-------------------------------------------------------------------------`
`2`	`2`	`*`
`3`		`- * shm.c`
	`3`	`+ * shmem.c`
`4`	`4`	`* Microsoft Windows Win32 Shared Memory Emulation`
`5`	`5`	`*`
`6`	`6`	`* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group`
`@@ -9,7 +9,6 @@`
`9`	`9`	`*/`
`10`	`10`
`11`	`11`	`#include "postgres.h"`
`12`		`-#include "windows.h"`
`13`	`12`
`14`	`13`	`#include <stdio.h>`
`15`	`14`	`#include <errno.h>`