2 files changed, 2 insertions, 130 deletions
diff --git a/src/backend/port/win32/Makefile b/src/backend/port/win32/Makefile
index daa98f65519..620d921eddb 100644
--- a/src/backend/port/win32/Makefile
+++ b/src/backend/port/win32/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for backend/port/win32
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/port/win32/Makefile,v 1.9 2007/01/20 17:16:12 petere Exp $
+#    $PostgreSQL: pgsql/src/backend/port/win32/Makefile,v 1.10 2007/03/21 14:39:23 mha Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -12,7 +12,7 @@ subdir = src/backend/port/win32
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = shmem.o timer.o socket.o signal.o security.o
+OBJS = timer.o socket.o signal.o security.o
 
 all: SUBSYS.o
 
diff --git a/src/backend/port/win32/shmem.c b/src/backend/port/win32/shmem.c
deleted file mode 100644
index 18dac2f553d..00000000000
--- a/src/backend/port/win32/shmem.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * shmem.c
- *	  Microsoft Windows Win32 Shared Memory Emulation
- *
- * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
- *
- * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/port/win32/shmem.c,v 1.14 2007/01/05 22:19:35 momjian Exp $
- *
- *-------------------------------------------------------------------------
- */
-
-#include "postgres.h"
-
-static DWORD s_segsize = 0;
-
-/* Detach from a shared mem area based on its address */
-int
-shmdt(const void *shmaddr)
-{
-	if (UnmapViewOfFile((LPCVOID *) shmaddr))
-		return 0;
-	else
-		return -1;
-}
-
-/* Attach to an existing area */
-void *
-shmat(int memId, void *shmaddr, int flag)
-{
-	/* TODO -- shmat needs to count # attached to shared mem */
-	void	   *lpmem = MapViewOfFileEx((HANDLE) memId,
-										FILE_MAP_WRITE | FILE_MAP_READ,
-			0, 0, /* (DWORD)pshmdsc->segsize */ 0 /* s_segsize */ , shmaddr);
-
-	if (lpmem == NULL)
-	{
-		lpmem = (void *) -1;
-		_dosmaperr(GetLastError());
-	}
-
-	return lpmem;
-}
-
-/* Control a shared mem area */
-int
-shmctl(int shmid, int flag, struct shmid_ds * dummy)
-{
-	if (flag == IPC_RMID)
-	{
-		/* Delete the area */
-		CloseHandle((HANDLE) shmid);
-		return 0;
-	}
-	if (flag == IPC_STAT)
-	{
-		/* Can only test for if exists */
-		int			hmap = shmget(shmid, 0, 0);
-
-		if (hmap < 0)
-		{
-			/* Shared memory does not exist */
-			errno = EINVAL;
-			return -1;
-		}
-		else
-		{
-			/* Shared memory does exist and must be in use */
-			shmctl(hmap, IPC_RMID, NULL);		/* Release our hold on it */
-			errno = 0;
-			return 0;
-		}
-	}
-
-	errno = EINVAL;
-	return -1;
-}
-
-/* Get an area based on the IPC key */
-int
-shmget(int memKey, int size, int flag)
-{
-	HANDLE		hmap;
-	char		szShareMem[32];
-	DWORD		dwRet;
-
-	s_segsize = size;
-	sprintf(szShareMem, "PostgreSQL.%d", memKey);
-
-	if (flag & IPC_CREAT)
-	{
-		hmap = CreateFileMapping((HANDLE) 0xFFFFFFFF,	/* Use the swap file	*/
-								 NULL,
-								 PAGE_READWRITE,		/* Memory is Read/Write */
-								 0L,	/* Size Upper 32 Bits	*/
-								 (DWORD) s_segsize,		/* Size Lower 32 bits */
-								 szShareMem);
-	}
-	else
-	{
-		hmap = OpenFileMapping(FILE_MAP_ALL_ACCESS,
-							   FALSE,
-							   szShareMem);
-		if (!hmap)
-		{
-			errno = ENOENT;
-			return -1;
-		}
-	}
-
-	dwRet = GetLastError();
-	if (dwRet == ERROR_ALREADY_EXISTS && hmap && (flag & (IPC_CREAT | IPC_EXCL)))
-	{
-		/* Caller wanted to create the segment -- error if already exists */
-		CloseHandle(hmap);
-		errno = EEXIST;
-		return -1;
-	}
-	else if (!hmap)
-	{
-		/* Unable to get shared memory */
-		_dosmaperr(GetLastError());
-		return -1;
-	}
-
-	return (int) hmap;
-}