Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 1c3a776

Browse files
committed
Re-add -I../.. for fmgr.h
Change #include "" to #include <> Remove a few unused #includes Make sure it compiles with -Wall -Werror
1 parent efef619 commit 1c3a776

File tree

8 files changed

+52
-52
lines changed

8 files changed

+52
-52
lines changed

src/backend/access/common/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
44
# Makefile for access/common
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.5 1996/11/03 09:06:42 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.6 1996/11/05 07:42:39 scrappy Exp $
88
#
99
#-------------------------------------------------------------------------
1010

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

14-
INCLUDE_OPT = -I../../port/$(PORTNAME) \
14+
INCLUDE_OPT = -I../.. \
15+
-I../../port/$(PORTNAME) \
1516
-I../../../include
1617

1718
CFLAGS+=$(INCLUDE_OPT)

src/backend/access/common/heaptuple.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.14 1996/11/05 05:26:29 scrappy Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.15 1996/11/05 07:42:40 scrappy Exp $
1212
*
1313
* NOTES
1414
* The old interface functions have been converted to macros
@@ -17,16 +17,16 @@
1717
*-------------------------------------------------------------------------
1818
*/
1919

20-
#include "postgres.h"
20+
#include <postgres.h>
2121

22-
#include "access/htup.h"
23-
#include "access/transam.h"
24-
#include "access/tupmacs.h"
25-
#include "storage/bufpage.h"
26-
#include "utils/memutils.h"
22+
#include <access/htup.h>
23+
#include <access/transam.h>
24+
#include <access/tupmacs.h>
25+
#include <storage/bufpage.h>
26+
#include <utils/memutils.h>
2727

2828
#ifndef HAVE_MEMMOVE
29-
# include "regex/utils.h"
29+
# include <regex/utils.h>
3030
#else
3131
# include <string.h>
3232
#endif

src/backend/access/common/heapvalid.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/common/Attic/heapvalid.c,v 1.10 1996/11/03 08:16:46 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/common/Attic/heapvalid.c,v 1.11 1996/11/05 07:42:41 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414

15-
#include "postgres.h"
15+
#include <postgres.h>
1616

17-
#include "fmgr.h"
18-
#include "access/heaptuple.h"
19-
#include "access/xact.h"
20-
#include "storage/bufpage.h"
21-
#include "utils/rel.h"
22-
#include "utils/tqual.h"
17+
#include <fmgr.h>
18+
#include <access/heaptuple.h>
19+
#include <access/xact.h>
20+
#include <storage/bufpage.h>
21+
#include <utils/rel.h>
22+
#include <utils/tqual.h>
2323

2424
/* ----------------
2525
* heap_keytest

src/backend/access/common/indextuple.c

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,20 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.11 1996/11/05 05:26:31 scrappy Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.12 1996/11/05 07:42:42 scrappy Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
1515

16-
#include "postgres.h"
16+
#include <postgres.h>
1717

18-
#include "access/heapam.h"
19-
#include "access/ibit.h"
20-
#include "access/itup.h"
21-
#include "access/relscan.h"
22-
#include "access/tupmacs.h"
18+
#include <access/heapam.h>
19+
#include <access/ibit.h>
20+
#include <access/itup.h>
21+
#include <access/tupmacs.h>
2322

2423
#ifndef HAVE_MEMMOVE
25-
# include "regex/utils.h"
24+
# include <regex/utils.h>
2625
#else
2726
# include <string.h>
2827
#endif

src/backend/access/common/indexvalid.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.10 1996/11/03 08:16:48 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.11 1996/11/05 07:42:43 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414

15-
#include "postgres.h"
15+
#include <postgres.h>
1616

17-
#include "access/htup.h"
18-
#include "access/itup.h"
19-
#include "access/skey.h"
20-
#include "executor/execdebug.h"
17+
#include <access/htup.h>
18+
#include <access/itup.h>
19+
#include <access/skey.h>
20+
#include <executor/execdebug.h>
2121

2222
/* ----------------------------------------------------------------
2323
* index scan key qualification code

src/backend/access/common/printtup.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.10 1996/11/05 05:26:32 scrappy Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.11 1996/11/05 07:42:44 scrappy Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
1515

16-
#include "postgres.h"
16+
#include <postgres.h>
1717

18-
#include "fmgr.h"
19-
#include "access/heaptuple.h"
20-
#include "catalog/pg_type.h"
21-
#include "libpq/libpq.h"
22-
#include "utils/syscache.h"
18+
#include <fmgr.h>
19+
#include <access/heaptuple.h>
20+
#include <catalog/pg_type.h>
21+
#include <libpq/libpq.h>
22+
#include <utils/syscache.h>
2323

2424
/* ----------------------------------------------------------------
2525
* printtup / debugtup support

src/backend/access/common/scankey.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.8 1996/11/03 10:57:23 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.9 1996/11/05 07:42:45 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414

15-
#include "postgres.h"
15+
#include <postgres.h>
1616

17-
#include "fmgr.h"
18-
#include "access/skey.h"
17+
#include <fmgr.h>
18+
#include <access/skey.h>
1919

2020
/*
2121
* ScanKeyEntryIsLegal --

src/backend/access/common/tupdesc.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.10 1996/11/05 05:25:44 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.11 1996/11/05 07:42:46 scrappy Exp $
1111
*
1212
* NOTES
1313
* some of the executor utility code such as "ExecTypeFromTL" should be
@@ -18,17 +18,17 @@
1818

1919
#include <stdio.h>
2020

21-
#include "postgres.h"
21+
#include <postgres.h>
2222

23-
#include "parser/catalog_utils.h"
24-
#include "nodes/parsenodes.h"
25-
#include "utils/builtins.h"
26-
#include "utils/fcache.h"
27-
#include "utils/tqual.h"
28-
#include "utils/syscache.h"
23+
#include <parser/catalog_utils.h>
24+
#include <nodes/parsenodes.h>
25+
#include <utils/builtins.h>
26+
#include <utils/fcache.h>
27+
#include <utils/tqual.h>
28+
#include <utils/syscache.h>
2929

3030
#ifndef HAVE_MEMMOVE
31-
# include "regex/utils.h"
31+
# include <regex/utils.h>
3232
#else
3333
# include <string.h>
3434
#endif

0 commit comments

Comments
 (0)