From 31cae34d078b5fc2bcb5f9b2e307aeef92079cf4 Mon Sep 17 00:00:00 2001
From: "Marc G. Fournier" <scrappy@hub.org>
Date: Thu, 25 Jul 1996 19:45:31 +0000
Subject: [PATCH] multiple define of 'union semun' removed
submitted by: dr. george
---
src/backend/storage/ipc/ipc.c | 12 +-----------
src/backend/storage/lmgr/proc.c | 13 ++-----------
2 files changed, 3 insertions(+), 22 deletions(-)
diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c
index 0ccccd78fc5..42bd370adb2 100644
--- a/src/backend/storage/ipc/ipc.c
+++ b/src/backend/storage/ipc/ipc.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.2 1996/07/20 08:35:52 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.3 1996/07/25 19:45:24 scrappy Exp $
*
* NOTES
*
@@ -47,16 +47,6 @@ int UsePrivateMemory = 1;
int UsePrivateMemory = 0;
#endif
-#if defined(PORTNAME_bsdi)||defined(PORTNAME_i386_solaris)
-/* hacka, hacka, hacka (XXX) */
-union semun {
- int val; /* value for SETVAL */
- struct semid_ds *buf; /* buffer for IPC_STAT & IPC_SET */
- ushort *array; /* array for GETALL & SETALL */
-};
-#endif
-
-
/* ----------------------------------------------------------------
* exit() handling stuff
* ----------------------------------------------------------------
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
index 10dad600b57..74651996d9c 100644
--- a/src/backend/storage/lmgr/proc.c
+++ b/src/backend/storage/lmgr/proc.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.2 1996/07/20 08:35:58 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.3 1996/07/25 19:45:31 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@@ -46,7 +46,7 @@
* This is so that we can support more backends. (system-wide semaphore
* sets run out pretty fast.) -ay 4/95
*
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.2 1996/07/20 08:35:58 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.3 1996/07/25 19:45:31 scrappy Exp $
*/
#include <sys/time.h>
#ifndef WIN32
@@ -56,15 +56,6 @@
#include <sys/types.h>
#include "libpq/pqsignal.h" /* substitute for <signal.h> */
-#if defined(PORTNAME_bsdi)||defined(PORTNAME_i386_solaris)
-/* hacka, hacka, hacka (XXX) */
-union semun {
- int val; /* value for SETVAL */
- struct semid_ds *buf; /* buffer for IPC_STAT & IPC_SET */
- ushort *array; /* array for GETALL & SETALL */
-};
-#endif
-
#include "access/xact.h"
#include "utils/hsearch.h"
#include "utils/elog.h"
--
GitLab