Skip to content

Commit ae64374

Browse files
tglsfdctglsfdc
committed
Fix a passel of recently-committed violations of the rule 'thou shalt
have no other gods before c.h'. Also remove some demonstrably redundant #include lines, mostly of <errno.h> which was added to c.h years ago.
1 parent 51e8882 commit ae64374

File tree

40 files changed

+48
-93
lines changed

40 files changed

+48
-93
lines changed

‎contrib/btree_gist/btree_numeric.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
#include "btree_gist.h"
2+
13
#include <math.h>
24
#include <float.h>
35

4-
#include "btree_gist.h"
56
#include "btree_utils_var.h"
67
#include "utils/builtins.h"
78
#include "utils/numeric.h"

‎contrib/btree_gist/btree_utils_num.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#ifndef __BTREE_UTILS_NUM_H__
22
#define __BTREE_UTILS_NUM_H__
33

4+
#include "btree_gist.h"
5+
46
#include <math.h>
57
#include <float.h>
68

7-
#include "btree_gist.h"
8-
99
typedef char GBT_NUMKEY;
1010

1111
/* Better readable key */

‎contrib/btree_gist/btree_utils_var.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
#include "btree_gist.h"
2+
13
#include <math.h>
24
#include <limits.h>
35
#include <float.h>
46

5-
#include "btree_gist.h"
67
#include "btree_utils_var.h"
78
#include "utils/pg_locale.h"
89
#include "utils/builtins.h"

‎contrib/btree_gist/btree_utils_var.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#ifndef __BTREE_UTILS_VAR_H__
22
#define __BTREE_UTILS_VAR_H__
33

4-
#include "mb/pg_wchar.h"
5-
64
#include "btree_gist.h"
75

6+
#include "mb/pg_wchar.h"
7+
88
/* Variable length key */
99
typedef bytea GBT_VARKEY;
1010

‎contrib/chkpass/chkpass.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@
44
* darcy@druid.net
55
* http://www.druid.net/darcy/
66
*
7-
* $PostgreSQL: pgsql/contrib/chkpass/chkpass.c,v 1.16 2006/05/30 22:12:12 tgl Exp $
7+
* $PostgreSQL: pgsql/contrib/chkpass/chkpass.c,v 1.17 2006/07/14 05:28:27 tgl Exp $
88
* best viewed with tabs set to 4
99
*/
1010

1111
#include "postgres.h"
1212

13-
#include <stdio.h>
14-
#include <string.h>
1513
#include <time.h>
1614
#include <unistd.h>
1715
#ifdef HAVE_CRYPT_H

‎contrib/fuzzystrmatch/dmetaphone.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This is a port of the Double Metaphone algorithm for use in PostgreSQL.
33
*
4-
* $PostgreSQL: pgsql/contrib/fuzzystrmatch/dmetaphone.c,v 1.7 2006/03/11 04:38:29 momjian Exp $
4+
* $PostgreSQL: pgsql/contrib/fuzzystrmatch/dmetaphone.c,v 1.8 2006/07/14 05:28:27 tgl Exp $
55
*
66
* Double Metaphone computes 2 "sounds like" strings - a primary and an
77
* alternate. In most cases they are the same, but for foreign names
@@ -50,8 +50,8 @@
5050

5151

5252
/*
53-
* $Revision: 1.7 $
54-
* $Id: dmetaphone.c,v 1.7 2006/03/11 04:38:29 momjian Exp $
53+
* $Revision: 1.8 $
54+
* $Id: dmetaphone.c,v 1.8 2006/07/14 05:28:27 tgl Exp $
5555
*/
5656

5757

@@ -106,8 +106,8 @@ The remaining code is authored by Andrew Dunstan <amdunstan@ncshp.org> and
106106
#ifndef DMETAPHONE_MAIN
107107

108108
#include "postgres.h"
109+
109110
#include "fmgr.h"
110-
#include "utils/elog.h"
111111

112112
/* turn off assertions for embedded function */
113113
#define NDEBUG

‎contrib/pg_trgm/trgm.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
#include "access/gist.h"
77
#include "access/itup.h"
88
#include "utils/builtins.h"
9-
#include "utils/elog.h"
10-
#include "utils/palloc.h"
119
#include "storage/bufpage.h"
1210

1311
/* options */

‎contrib/tsearch2/common.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#include "postgres.h"
22

3-
#include "postgres.h"
43
#include "fmgr.h"
54
#include "catalog/pg_namespace.h"
65
#include "catalog/pg_proc.h"

‎contrib/tsearch2/gendict/dict_snowball.c.IN

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
/* $PostgreSQL: pgsql/contrib/tsearch2/gendict/dict_snowball.c.IN,v 1.4 2006/03/11 04:38:30 momjian Exp $ */
1+
/* $PostgreSQL: pgsql/contrib/tsearch2/gendict/dict_snowball.c.IN,v 1.5 2006/07/14 05:28:27 tgl Exp $ */
22

33
/*
44
* example of Snowball dictionary
55
* http://snowball.tartarus.org/
66
* Teodor Sigaev <teodor@sigaev.ru>
77
*/
8-
#include <stdlib.h>
9-
#include <string.h>
10-
118
#include "postgres.h"
129

1310
#include "dict.h"

‎contrib/tsearch2/gendict/dict_tmpl.c.IN

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
1-
/* $PostgreSQL: pgsql/contrib/tsearch2/gendict/dict_tmpl.c.IN,v 1.5 2006/03/11 04:38:30 momjian Exp $ */
1+
/* $PostgreSQL: pgsql/contrib/tsearch2/gendict/dict_tmpl.c.IN,v 1.6 2006/07/14 05:28:27 tgl Exp $ */
22

33
/*
44
* example of dictionary
55
* Teodor Sigaev <teodor@sigaev.ru>
66
*/
7-
#include <errno.h>
8-
#include <stdlib.h>
9-
#include <string.h>
10-
117
#include "postgres.h"
128

139
#include "dict.h"

0 commit comments

Comments
 (0)