diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2001-10-01 18:16:35 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2001-10-01 18:16:35 +0000 |
| commit | 0648d78ac4ae3d3945348392795a401ddd4b2839 (patch) | |
| tree | 6514ba3505f10d2ed9db68d882f650c72b7a194c /src/backend | |
| parent | 6d18c038b70b7c6d745b466443eff96d53394c21 (diff) | |
| download | postgresql-0648d78ac4ae3d3945348392795a401ddd4b2839.tar.gz postgresql-0648d78ac4ae3d3945348392795a401ddd4b2839.zip | |
Make inclusion logic for sys/sem.h and sys/ipc.h consistent across all
the files that need them. Per trouble report from Teodor.
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/storage/ipc/ipc.c | 9 | ||||
| -rw-r--r-- | src/backend/storage/lmgr/proc.c | 20 | ||||
| -rw-r--r-- | src/backend/storage/lmgr/spin.c | 10 |
3 files changed, 17 insertions, 22 deletions
diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c index 9d2b373a589..0552ff288ea 100644 --- a/src/backend/storage/ipc/ipc.c +++ b/src/backend/storage/ipc/ipc.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.69 2001/09/29 04:02:23 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.70 2001/10/01 18:16:26 tgl Exp $ * * NOTES * @@ -27,11 +27,10 @@ */ #include "postgres.h" -#include <sys/types.h> -#include <sys/file.h> #include <errno.h> #include <signal.h> #include <unistd.h> +#include <sys/file.h> #include "storage/ipc.h" /* In Ultrix, sem.h and shm.h must be included AFTER ipc.h */ @@ -45,10 +44,6 @@ #include <kernel/OS.h> #endif -#if defined(solaris_sparc) -#include <sys/ipc.h> -#endif - #if defined(__darwin__) #include "port/darwin/sem.h" #endif diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index a8f1b7bfbc6..5b88e22bd9b 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.111 2001/09/30 00:45:47 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.112 2001/10/01 18:16:32 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -47,27 +47,21 @@ #include "postgres.h" #include <errno.h> -#include <sys/time.h> -#include <unistd.h> #include <signal.h> -#include <sys/types.h> +#include <unistd.h> +#include <sys/time.h> -#if defined(solaris_sparc) || defined(__CYGWIN__) -#include <sys/ipc.h> +#include "storage/ipc.h" +/* In Ultrix, sem.h and shm.h must be included AFTER ipc.h */ +#ifdef HAVE_SYS_SEM_H #include <sys/sem.h> #endif -#include "miscadmin.h" - #if defined(__darwin__) #include "port/darwin/sem.h" #endif -/* In Ultrix and QNX, sem.h must be included after ipc.h */ -#ifdef HAVE_SYS_SEM_H -#include <sys/sem.h> -#endif - +#include "miscadmin.h" #include "access/xact.h" #include "storage/proc.h" #include "storage/sinval.h" diff --git a/src/backend/storage/lmgr/spin.c b/src/backend/storage/lmgr/spin.c index 454a28aca5e..6ace9cc11aa 100644 --- a/src/backend/storage/lmgr/spin.c +++ b/src/backend/storage/lmgr/spin.c @@ -15,18 +15,24 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/spin.c,v 1.3 2001/10/01 17:52:34 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/spin.c,v 1.4 2001/10/01 18:16:35 tgl Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" #include <errno.h> + +#include "storage/ipc.h" +/* In Ultrix, sem.h and shm.h must be included AFTER ipc.h */ #ifdef HAVE_SYS_SEM_H -#include <sys/types.h> #include <sys/sem.h> #endif +#if defined(__darwin__) +#include "port/darwin/sem.h" +#endif + #include "storage/lwlock.h" #include "storage/proc.h" #include "storage/spin.h" |