Skip to content

Commit 278bd0c

Browse files
tglsfdctglsfdc
committed
For some reason access/tupmacs.h has been #including utils/memutils.h,
which is neither needed by nor related to that header. Remove the bogus inclusion and instead include the header in those C files that actually need it. Also fix unnecessary inclusions and bad inclusion order in tsearch2 files.
1 parent 4eec2f2 commit 278bd0c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+92
-83
lines changed

‎contrib/tsearch2/dict.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,15 @@
22
* interface functions to dictionary
33
* Teodor Sigaev <teodor@sigaev.ru>
44
*/
5-
#include <errno.h>
6-
#include <stdlib.h>
7-
#include <string.h>
5+
#include "postgres.h"
6+
87
#include <ctype.h>
98

10-
#include "postgres.h"
11-
#include "fmgr.h"
12-
#include "utils/array.h"
139
#include "catalog/pg_type.h"
1410
#include "executor/spi.h"
11+
#include "fmgr.h"
12+
#include "utils/array.h"
13+
#include "utils/memutils.h"
1514

1615
#include "dict.h"
1716
#include "common.h"

‎contrib/tsearch2/dict_ex.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
* example of dictionary
33
* Teodor Sigaev <teodor@sigaev.ru>
44
*/
5-
#include <errno.h>
6-
#include <stdlib.h>
7-
#include <string.h>
8-
95
#include "postgres.h"
106

117
#include "dict.h"

‎contrib/tsearch2/dict_ispell.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22
* ISpell interface
33
* Teodor Sigaev <teodor@sigaev.ru>
44
*/
5-
#include <stdlib.h>
6-
#include <string.h>
7-
#include <ctype.h>
8-
95
#include "postgres.h"
106

7+
#include <ctype.h>
8+
119
#include "dict.h"
1210
#include "common.h"
1311
#include "ispell/spell.h"

‎contrib/tsearch2/dict_snowball.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
* http://snowball.tartarus.org/
44
* Teodor Sigaev <teodor@sigaev.ru>
55
*/
6-
#include <stdlib.h>
7-
#include <string.h>
8-
96
#include "postgres.h"
107

118
#include "dict.h"

‎contrib/tsearch2/dict_syn.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,10 @@
22
* ISpell interface
33
* Teodor Sigaev <teodor@sigaev.ru>
44
*/
5-
#include <stdlib.h>
6-
#include <string.h>
7-
#include <ctype.h>
8-
#include <errno.h>
9-
105
#include "postgres.h"
116

7+
#include <ctype.h>
8+
129
#include "dict.h"
1310
#include "common.h"
1411

‎contrib/tsearch2/prs_dcfg.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22
* Simple config parser
33
* Teodor Sigaev <teodor@sigaev.ru>
44
*/
5-
#include <stdlib.h>
6-
#include <string.h>
7-
#include <ctype.h>
8-
95
#include "postgres.h"
106

7+
#include <ctype.h>
8+
119
#include "dict.h"
1210
#include "common.h"
1311

‎contrib/tsearch2/snmap.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@
22
* simple but fast map from str to Oid
33
* Teodor Sigaev <teodor@sigaev.ru>
44
*/
5-
#include <errno.h>
6-
#include <stdlib.h>
7-
#include <string.h>
8-
95
#include "postgres.h"
6+
107
#include "snmap.h"
118
#include "common.h"
129

‎contrib/tsearch2/ts_cfg.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,16 @@
22
* interface functions to tscfg
33
* Teodor Sigaev <teodor@sigaev.ru>
44
*/
5-
#include <errno.h>
6-
#include <stdlib.h>
7-
#include <string.h>
5+
#include "postgres.h"
6+
87
#include <ctype.h>
98
#include <locale.h>
109

11-
#include "postgres.h"
12-
#include "fmgr.h"
13-
#include "utils/array.h"
1410
#include "catalog/pg_type.h"
1511
#include "executor/spi.h"
12+
#include "fmgr.h"
13+
#include "utils/array.h"
14+
#include "utils/memutils.h"
1615

1716
#include "ts_cfg.h"
1817
#include "dict.h"

‎contrib/tsearch2/wparser.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,16 @@
22
* interface functions to parser
33
* Teodor Sigaev <teodor@sigaev.ru>
44
*/
5-
#include <errno.h>
6-
#include <stdlib.h>
7-
#include <string.h>
5+
#include "postgres.h"
6+
87
#include <ctype.h>
98

10-
#include "postgres.h"
11-
#include "fmgr.h"
12-
#include "utils/array.h"
139
#include "catalog/pg_type.h"
1410
#include "executor/spi.h"
11+
#include "fmgr.h"
1512
#include "funcapi.h"
13+
#include "utils/array.h"
14+
#include "utils/memutils.h"
1615

1716
#include "wparser.h"
1817
#include "ts_cfg.h"

‎contrib/tsearch2/wparser_def.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@
22
* default word parser
33
* Teodor Sigaev <teodor@sigaev.ru>
44
*/
5-
#include <errno.h>
6-
#include <stdlib.h>
7-
#include <string.h>
8-
95
#include "postgres.h"
6+
107
#include "utils/builtins.h"
118

129
#include "dict.h"

0 commit comments

Comments
 (0)