multiple define of 'union semun' removed

scrappy · scrappy · commit 31cae34d078b · 1996-07-25T19:45:31.000Z
submitted by: dr. george
diff --git 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
@@ -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"

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.2 1996/07/20 08:35:52 scrappy Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.3 1996/07/25 19:45:24 scrappy Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`*`
`@@ -47,16 +47,6 @@ int UsePrivateMemory = 1;`
`47`	`47`	`int UsePrivateMemory = 0;`
`48`	`48`	`#endif`
`49`	`49`
`50`		`-#if defined(PORTNAME_bsdi)\|\|defined(PORTNAME_i386_solaris)`
`51`		`-/* hacka, hacka, hacka (XXX) */`
`52`		`-union semun {`
`53`		`- int val; /* value for SETVAL */`
`54`		`- struct semid_ds buf; / buffer for IPC_STAT & IPC_SET */`
`55`		`- ushort array; / array for GETALL & SETALL */`
`56`		`-};`
`57`		`-#endif`
`58`		`-`
`59`		`-`
`60`	`50`	`/* ----------------------------------------------------------------`
`61`	`51`	`* exit() handling stuff`
`62`	`52`	`* ----------------------------------------------------------------`