Commit0648d78

committed

Make inclusion logic for sys/sem.h and sys/ipc.h consistent across all

the files that need them. Per trouble report from Teodor.

1 parent6d18c03 commit0648d78Copy full SHA for 0648d78

File tree

+17

-22

lines changed

+17

-22

lines changed

Lines changed: 2 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.69 2001/09/29 04:02:23 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.70 2001/10/01 18:16:26 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`*`
`@@ -27,11 +27,10 @@`
`27`	`27`	`*/`
`28`	`28`	`#include"postgres.h"`
`29`	`29`
`30`		`-#include<sys/types.h>`
`31`		`-#include<sys/file.h>`
`32`	`30`	`#include<errno.h>`
`33`	`31`	`#include<signal.h>`
`34`	`32`	`#include<unistd.h>`
	`33`	`+#include<sys/file.h>`
`35`	`34`
`36`	`35`	`#include"storage/ipc.h"`
`37`	`36`	`/* In Ultrix, sem.h and shm.h must be included AFTER ipc.h */`
`@@ -45,10 +44,6 @@`
`45`	`44`	`#include<kernel/OS.h>`
`46`	`45`	`#endif`
`47`	`46`
`48`		`-#if defined(solaris_sparc)`
`49`		`-#include<sys/ipc.h>`
`50`		`-#endif`
`51`		`-`
`52`	`47`	`#if defined(__darwin__)`
`53`	`48`	`#include"port/darwin/sem.h"`
`54`	`49`	`#endif`

Lines changed: 7 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.111 2001/09/30 00:45:47 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.112 2001/10/01 18:16:32 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -47,27 +47,21 @@`
`47`	`47`	`#include"postgres.h"`
`48`	`48`
`49`	`49`	`#include<errno.h>`
`50`		`-#include<sys/time.h>`
`51`		`-#include<unistd.h>`
`52`	`50`	`#include<signal.h>`
`53`		`-#include<sys/types.h>`
	`51`	`+#include<unistd.h>`
	`52`	`+#include<sys/time.h>`
`54`	`53`
`55`		`-#if defined(solaris_sparc)\|\| defined(__CYGWIN__)`
`56`		`-#include<sys/ipc.h>`
	`54`	`+#include"storage/ipc.h"`
	`55`	`+/* In Ultrix, sem.h and shm.h must be included AFTER ipc.h */`
	`56`	`+#ifdefHAVE_SYS_SEM_H`
`57`	`57`	`#include<sys/sem.h>`
`58`	`58`	`#endif`
`59`	`59`
`60`		`-#include"miscadmin.h"`
`61`		`-`
`62`	`60`	`#if defined(__darwin__)`
`63`	`61`	`#include"port/darwin/sem.h"`
`64`	`62`	`#endif`
`65`	`63`
`66`		`-/* In Ultrix and QNX, sem.h must be included after ipc.h */`
`67`		`-#ifdefHAVE_SYS_SEM_H`
`68`		`-#include<sys/sem.h>`
`69`		`-#endif`
`70`		`-`
	`64`	`+#include"miscadmin.h"`
`71`	`65`	`#include"access/xact.h"`
`72`	`66`	`#include"storage/proc.h"`
`73`	`67`	`#include"storage/sinval.h"`

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,18 +15,24 @@`
`15`	`15`	`*`
`16`	`16`	`*`
`17`	`17`	`* IDENTIFICATION`
`18`		`- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/spin.c,v 1.3 2001/10/0117:52:34 momjian Exp $`
	`18`	`+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/spin.c,v 1.4 2001/10/0118:16:35 tgl Exp $`
`19`	`19`	`*`
`20`	`20`	`*-------------------------------------------------------------------------`
`21`	`21`	`*/`
`22`	`22`	`#include"postgres.h"`
`23`	`23`
`24`	`24`	`#include<errno.h>`
	`25`	`+`
	`26`	`+#include"storage/ipc.h"`
	`27`	`+/* In Ultrix, sem.h and shm.h must be included AFTER ipc.h */`
`25`	`28`	`#ifdefHAVE_SYS_SEM_H`
`26`		`-#include<sys/types.h>`
`27`	`29`	`#include<sys/sem.h>`
`28`	`30`	`#endif`
`29`	`31`
	`32`	`+#if defined(__darwin__)`
	`33`	`+#include"port/darwin/sem.h"`
	`34`	`+#endif`
	`35`	`+`
`30`	`36`	`#include"storage/lwlock.h"`
`31`	`37`	`#include"storage/proc.h"`
`32`	`38`	`#include"storage/spin.h"`

Comments

(0)