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

Commit6fac460

Browse files
committed
Clean up Makefile(s)
Add #include "postgres.h" as requiredRemove #include "c.h" *and* "utils/elog.h" as applicable
1 parent66637f4 commit6fac460

File tree

25 files changed

+52
-64
lines changed

25 files changed

+52
-64
lines changed

‎src/backend/storage/ipc/Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,14 @@
44
# Makefile for storage/ipc
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/storage/ipc/Makefile,v 1.1 1996/10/27 09:52:10 bryanh Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/storage/ipc/Makefile,v 1.2 1996/11/03 05:06:52 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

1111
SRCDIR = ../../..
1212
include ../../../Makefile.global
1313

14-
INCLUDE_OPT = -I../..\
15-
-I../../port/$(PORTNAME)\
16-
-I../../include\
14+
INCLUDE_OPT = -I../../port/$(PORTNAME)\
1715
-I../../../include
1816

1917
CFLAGS+=$(INCLUDE_OPT)

‎src/backend/storage/ipc/ipc.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/storage/ipc/ipc.c,v 1.5 1996/10/31 10:20:06 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.6 1996/11/03 05:06:54 scrappy Exp $
1111
*
1212
* NOTES
1313
*
@@ -37,9 +37,9 @@
3737
#include<sys/shm.h>
3838
#endif
3939

40+
#include"postgres.h"
4041
#include"storage/ipc.h"
4142
#include"utils/memutils.h"
42-
#include"utils/elog.h"
4343

4444
#if defined(bsd44)
4545
intUsePrivateMemory=1;

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.1.1.1 1996/07/0906:21:54 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.2 1996/11/03 05:06:55 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
14-
#include"c.h"
14+
#include"postgres.h"
1515

1616
#include"storage/ipc.h"
1717
#include"storage/multilev.h"
18-
#include"utils/elog.h"
1918
#include"storage/sinval.h"
2019
#include"storage/bufmgr.h"
2120
#include"storage/proc.h"

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/s_lock.c,v 1.5 1996/10/31 10:20:09 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/s_lock.c,v 1.6 1996/11/03 05:06:56 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -40,6 +40,9 @@
4040
#ifdefWIN32
4141
#include<windows.h>
4242
#endif/* WIN32 */
43+
44+
#include"postgres.h"
45+
4346
#include"storage/ipc.h"
4447

4548

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

Lines changed: 1 addition & 2 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/shmem.c,v 1.2 1996/10/31 05:54:42 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.3 1996/11/03 05:06:57 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -65,7 +65,6 @@
6565
#include"storage/shmem.h"
6666
#include"storage/spin.h"
6767
#include"utils/hsearch.h"
68-
#include"utils/elog.h"
6968

7069
/* shared memory global variables */
7170

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

Lines changed: 1 addition & 2 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/shmqueue.c,v 1.1.1.1 1996/07/0906:21:54 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmqueue.c,v 1.2 1996/11/03 05:06:58 scrappy Exp $
1111
*
1212
* NOTES
1313
*
@@ -25,7 +25,6 @@
2525
#include<stdio.h>/* for sprintf() */
2626
#include"postgres.h"
2727
#include"storage/shmem.h"/* where the declarations go */
28-
#include"utils/elog.h"
2928

3029
/*#define SHMQUEUE_DEBUG*/
3130
#ifdefSHMQUEUE_DEBUG

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinval.c,v 1.2 1996/10/31 05:54:43 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinval.c,v 1.3 1996/11/03 05:06:59 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414
/* #define INVALIDDEBUG1 */
1515

16+
#include<sys/types.h>
1617
#include<sys/ipc.h>
1718

1819
#include"postgres.h"
1920

2021
#include"storage/sinval.h"
2122
#include"storage/sinvaladt.h"
2223
#include"storage/spin.h"
23-
#include"utils/elog.h"
2424

2525
externSISeg*shmInvalBuffer;/* the shared buffer segment, set by*/
2626
/* SISegmentAttach() */

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,16 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.1.1.1 1996/07/09 06:21:54 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.2 1996/11/03 05:07:00 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
14+
15+
#include"postgres.h"
16+
1417
#include"storage/ipc.h"
1518
#include"storage/sinvaladt.h"
1619
#include"storage/lmgr.h"
17-
#include"utils/elog.h"
1820
#include"utils/palloc.h"
1921

2022
/* ----------------

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

Lines changed: 1 addition & 2 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/Attic/spin.c,v 1.1.1.1 1996/07/09 06:21:55 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/spin.c,v 1.2 1996/11/03 05:07:02 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -30,7 +30,6 @@
3030
#include"storage/shmem.h"
3131
#include"storage/spin.h"
3232
#include"storage/proc.h"
33-
#include"utils/elog.h"
3433

3534
/* globals used in this file */
3635
IpcSemaphoreIdSpinLockId;

‎src/backend/storage/large_object/Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,14 @@
44
# Makefile for storage/large_object
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/storage/large_object/Makefile,v 1.1 1996/10/27 09:52:20 bryanh Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/storage/large_object/Makefile,v 1.2 1996/11/03 05:07:07 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

1111
SRCDIR = ../../..
1212
include ../../../Makefile.global
1313

14-
INCLUDE_OPT = -I../..\
15-
-I../../port/$(PORTNAME)\
16-
-I../../include\
14+
INCLUDE_OPT = -I../../port/$(PORTNAME)\
1715
-I../../../include
1816

1917
CFLAGS+=$(INCLUDE_OPT)

‎src/backend/storage/large_object/inv_api.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.2 1996/08/26 06:31:45 scrappy Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.3 1996/11/03 05:07:10 scrappy Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
1515
#include<stdio.h>/* for sprintf() */
1616
#include<sys/file.h>
17-
#include"c.h"
17+
#include"postgres.h"
1818
#include"libpq/libpq-fs.h"
1919
#include"access/genam.h"
2020
#include"access/heapam.h"
@@ -34,7 +34,6 @@
3434
#include"utils/rel.h"
3535
#include"utils/palloc.h"
3636
#include"storage/large_object.h"
37-
#include"utils/elog.h"
3837
#include"utils/syscache.h"
3938
#include"utils/builtins.h"/* for namestrcpy() */
4039
#include"catalog/heap.h"

‎src/backend/storage/lmgr/Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,14 @@
44
# Makefile for storage/lmgr
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Makefile,v 1.1 1996/10/27 09:52:27 bryanh Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Makefile,v 1.2 1996/11/03 05:07:19 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

1111
SRCDIR = ../../..
1212
include ../../../Makefile.global
1313

14-
INCLUDE_OPT = -I../..\
15-
-I../../port/$(PORTNAME)\
16-
-I../../include\
14+
INCLUDE_OPT = -I../../port/$(PORTNAME)\
1715
-I../../../include
1816

1917
CFLAGS+=$(INCLUDE_OPT)

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

Lines changed: 1 addition & 2 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/lmgr.c,v 1.1.1.1 1996/07/09 06:21:56 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.2 1996/11/03 05:07:26 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -34,7 +34,6 @@
3434
#include"storage/multilev.h"
3535
#include"storage/lmgr.h"
3636

37-
#include"utils/elog.h"
3837
#include"utils/palloc.h"
3938
#include"utils/rel.h"
4039

‎src/backend/storage/lmgr/lock.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/storage/lmgr/lock.c,v 1.3 1996/10/11 03:22:56 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.4 1996/11/03 05:07:29 scrappy Exp $
1111
*
1212
* NOTES
1313
* Outside modules can create a lock table and acquire/release
@@ -32,12 +32,12 @@
3232
*-------------------------------------------------------------------------
3333
*/
3434
#include<stdio.h>/* for sprintf() */
35+
#include"postgres.h"
3536
#include"storage/shmem.h"
3637
#include"storage/spin.h"
3738
#include"storage/proc.h"
3839
#include"storage/lock.h"
3940
#include"utils/hsearch.h"
40-
#include"utils/elog.h"
4141
#include"utils/palloc.h"
4242
#include"access/xact.h"
4343

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
*
1414
* IDENTIFICATION
15-
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.1.1.1 1996/07/09 06:21:56 scrappy Exp $
15+
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.2 1996/11/03 05:07:31 scrappy Exp $
1616
*
1717
* NOTES:
1818
* (1) The lock.c module assumes that the caller here is doing
@@ -22,11 +22,11 @@
2222
*/
2323
#include<stdio.h>
2424
#include<string.h>
25+
#include"postgres.h"
2526
#include"storage/lmgr.h"
2627
#include"storage/multilev.h"
2728

2829
#include"utils/rel.h"
29-
#include"utils/elog.h"
3030
#include"miscadmin.h"/* MyDatabaseId */
3131

3232

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

Lines changed: 4 additions & 3 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.6 1996/10/11 03:22:59 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.7 1996/11/03 05:07:32 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -46,19 +46,20 @@
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.6 1996/10/11 03:22:59 scrappy Exp $
49+
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.7 1996/11/03 05:07:32 scrappy Exp $
5050
*/
5151
#include<sys/time.h>
5252
#ifndefWIN32
5353
#include<unistd.h>
5454
#endif/* WIN32 */
5555
#include<string.h>
5656
#include<sys/types.h>
57+
58+
#include"postgres.h"
5759
#include"libpq/pqsignal.h"/* substitute for <signal.h> */
5860

5961
#include"access/xact.h"
6062
#include"utils/hsearch.h"
61-
#include"utils/elog.h"
6263

6364
#include"storage/buf.h"
6465
#include"storage/lock.h"

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,14 @@
1313
*
1414
*
1515
* IDENTIFICATION
16-
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/single.c,v 1.1.1.1 1996/07/09 06:21:57 scrappy Exp $
16+
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/single.c,v 1.2 1996/11/03 05:07:33 scrappy Exp $
1717
*
1818
*-------------------------------------------------------------------------
1919
*/
2020
#include<string.h>
21+
22+
#include"postgres.h"
23+
2124
#include"storage/lmgr.h"/* where the declarations go */
2225
#include"storage/lock.h"
2326
#include"storage/multilev.h"

‎src/backend/storage/page/Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,14 @@
44
# Makefile for storage/page
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/storage/page/Makefile,v 1.1 1996/10/27 09:52:34 bryanh Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/storage/page/Makefile,v 1.2 1996/11/03 05:07:43 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

1111
SRCDIR = ../../..
1212
include ../../../Makefile.global
1313

14-
INCLUDE_OPT = -I../..\
15-
-I../../port/$(PORTNAME)\
16-
-I../../include\
14+
INCLUDE_OPT = -I../../port/$(PORTNAME)\
1715
-I../../../include
1816

1917
CFLAGS+=$(INCLUDE_OPT)

‎src/backend/storage/page/bufpage.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,18 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.1.1.1 1996/07/09 06:21:58 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.2 1996/11/03 05:07:44 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414
#include<sys/types.h>
1515
#include<sys/file.h>
1616

17-
#include"c.h"
17+
#include"postgres.h"
1818

1919
#include"storage/item.h"
2020
#include"storage/buf.h"
2121
#include"storage/bufmgr.h"
22-
#include"utils/elog.h"
2322
#include"utils/palloc.h"
2423
#include"utils/memutils.h"
2524
#include"storage/bufpage.h"

‎src/backend/storage/page/itemptr.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/storage/page/itemptr.c,v 1.1.1.1 1996/07/09 06:21:59 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/page/itemptr.c,v 1.2 1996/11/03 05:07:46 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
14-
#include"c.h"
14+
#include"postgres.h"
1515

1616
#include"storage/block.h"
1717
#include"storage/off.h"

0 commit comments

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