Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5e98c40

Browse files
author
Bryan Henderson
committed
Change the way ipc.h is included because sys/ipc.h on Ultrix is broken.
1 parente5ff0b9 commit5e98c40

File tree

5 files changed

+13
-18
lines changed

5 files changed

+13
-18
lines changed

‎src/backend/storage/ipc/ipc.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.9 1996/11/10 03:02:21 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.10 1997/01/08 08:32:01 bryanh Exp $
1111
*
1212
* NOTES
1313
*
@@ -30,16 +30,12 @@
3030
#include<string.h>
3131
#include<errno.h>
3232

33-
/* XXX - the following dependency should be moved into the defaults.mk file */
34-
#ifndef_IPC_
35-
#define_IPC_
36-
#include<sys/ipc.h>
37-
#include<sys/sem.h>
38-
#include<sys/shm.h>
39-
#endif
4033

4134
#include"postgres.h"
4235
#include"storage/ipc.h"
36+
/* In Ultrix, sem.h and shm.h must be included AFTER ipc.h */
37+
#include<sys/sem.h>
38+
#include<sys/shm.h>
4339
#include"utils/memutils.h"
4440

4541
#if defined(sparc_solaris)

‎src/backend/storage/ipc/ipci.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.4 1996/11/0805:58:33 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.5 1997/01/0808:32:03 bryanh Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414
#include<string.h>
1515
#include<sys/types.h>
16-
#include<sys/ipc.h>
1716

1817
#include"postgres.h"
1918

‎src/backend/storage/ipc/sinval.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinval.c,v 1.5 1996/11/10 03:02:30 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinval.c,v 1.6 1997/01/08 08:32:04 bryanh Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414
/* #define INVALIDDEBUG1 */
1515

1616
#include<sys/types.h>
17-
#include<sys/ipc.h>
1817

1918
#include"postgres.h"
2019

‎src/backend/storage/lmgr/proc.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.12 1996/12/26 22:07:28 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.13 1997/01/08 08:32:17 bryanh Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -46,7 +46,7 @@
4646
* This is so that we can support more backends. (system-wide semaphore
4747
* sets run out pretty fast.) -ay 4/95
4848
*
49-
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.12 1996/12/26 22:07:28 momjian Exp $
49+
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.13 1997/01/08 08:32:17 bryanh Exp $
5050
*/
5151
#include<sys/time.h>
5252
#ifndefWIN32
@@ -55,8 +55,6 @@
5555
#include<string.h>
5656
#include<signal.h>
5757
#include<sys/types.h>
58-
#include<sys/ipc.h>
59-
#include<sys/sem.h>
6058

6159
#if defined(sparc_solaris)
6260
#include<sys/ipc.h>
@@ -70,6 +68,9 @@
7068
#include"access/xact.h"
7169
#include"utils/hsearch.h"
7270

71+
#include"storage/ipc.h"
72+
/* In Ultrix, sem.h must be included after ipc.h */
73+
#include<sys/sem.h>
7374
#include"storage/buf.h"
7475
#include"storage/lock.h"
7576
#include"storage/lmgr.h"

‎src/backend/utils/init/postinit.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.6 1996/11/12 06:46:42 bryanh Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.7 1997/01/08 08:33:07 bryanh Exp $
1111
*
1212
* NOTES
1313
* InitPostgres() is the function called from PostgresMain
@@ -32,13 +32,13 @@
3232
#include<sys/file.h>
3333
#include<sys/stat.h>
3434
#include<sys/types.h>
35-
#include<sys/ipc.h>
3635
#include<math.h>
3736
#include<unistd.h>
3837

3938
#include"postgres.h"
4039
#include"version.h"
4140

41+
#include<storage/ipc.h>
4242
#include<storage/backendid.h>
4343
#include<storage/buf_internals.h>
4444
#include<storage/smgr.h>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp