Commit31cae34

committed

multiple define of 'union semun' removed

submitted by: dr. george

1 parentfd35587 commit31cae34Copy full SHA for 31cae34

File tree

-22

lines changed

-22

lines changed

Lines changed: 1 addition & 11 deletions

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`	`intUsePrivateMemory=0;`
`48`	`48`	`#endif`
`49`	`49`
`50`		`-#if defined(PORTNAME_bsdi)\|\|defined(PORTNAME_i386_solaris)`
`51`		`-/* hacka, hacka, hacka (XXX) */`
`52`		`-unionsemun {`
`53`		`-intval;/* value for SETVAL */`
`54`		`-structsemid_dsbuf;/ buffer for IPC_STAT & IPC_SET */`
`55`		`-ushortarray;/ array for GETALL & SETALL */`
`56`		`-};`
`57`		`-#endif`
`58`		`-`
`59`		`-`
`60`	`50`	`/* ----------------------------------------------------------------`
`61`	`51`	`*exit() handling stuff`
`62`	`52`	`* ----------------------------------------------------------------`

Lines changed: 2 additions & 11 deletions

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/lmgr/proc.c,v 1.2 1996/07/20 08:35:58 scrappy Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.3 1996/07/25 19:45:31 scrappy Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -46,7 +46,7 @@`
`46`	`46`	`* This is so that we can support more backends. (system-wide semaphore`
`47`	`47`	`* sets run out pretty fast.) -ay 4/95`
`48`	`48`	`*`
`49`		`- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.2 1996/07/20 08:35:58 scrappy Exp $`
	`49`	`+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.3 1996/07/25 19:45:31 scrappy Exp $`
`50`	`50`	`*/`
`51`	`51`	`#include<sys/time.h>`
`52`	`52`	`#ifndefWIN32`
`@@ -56,15 +56,6 @@`
`56`	`56`	`#include<sys/types.h>`
`57`	`57`	`#include"libpq/pqsignal.h"/* substitute for <signal.h> */`
`58`	`58`
`59`		`-#if defined(PORTNAME_bsdi)\|\|defined(PORTNAME_i386_solaris)`
`60`		`-/* hacka, hacka, hacka (XXX) */`
`61`		`-unionsemun {`
`62`		`-intval;/* value for SETVAL */`
`63`		`-structsemid_dsbuf;/ buffer for IPC_STAT & IPC_SET */`
`64`		`-ushortarray;/ array for GETALL & SETALL */`
`65`		`-};`
`66`		`-#endif`
`67`		`-`
`68`	`59`	`#include"access/xact.h"`
`69`	`60`	`#include"utils/hsearch.h"`
`70`	`61`	`#include"utils/elog.h"`

Comments

(0)