Skip to content

Commit 1eb7cb2

Browse files
peterepetere
committed
Remove pgrminclude annotations
Per git log, the last time someone tried to do something with pgrminclude was around 2011. Many (not all) of the "pgrminclude ignore" annotations are of a newer date but seem to have just been copied around during refactorings and file moves and don't seem to reflect an actual need anymore. There have been some parallel experiments with include-what-you-use (IWYU) annotations, but these don't seem to correspond very strongly to pgrminclude annotations, so there is no value in keeping the existing ones even for that kind of thing. So, wipe them all away. We can always add new ones in the future based on actual needs. Discussion: https://www.postgresql.org/message-id/flat/2d4dc7b2-cb2e-49b1-b8ca-ba5f7024f05b%40eisentraut.org
1 parent 6f3820f commit 1eb7cb2

File tree

15 files changed

+19
-20
lines changed

15 files changed

+19
-20
lines changed

‎src/backend/access/brin/brin.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include "postmaster/autovacuum.h"
3434
#include "storage/bufmgr.h"
3535
#include "storage/freespace.h"
36-
#include "tcop/tcopprot.h" /* pgrminclude ignore */
36+
#include "tcop/tcopprot.h"
3737
#include "utils/acl.h"
3838
#include "utils/datum.h"
3939
#include "utils/fmgrprotos.h"

‎src/backend/access/nbtree/nbtsort.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
#include "miscadmin.h"
5252
#include "pgstat.h"
5353
#include "storage/bulk_write.h"
54-
#include "tcop/tcopprot.h" /* pgrminclude ignore */
54+
#include "tcop/tcopprot.h"
5555
#include "utils/rel.h"
5656
#include "utils/sortsupport.h"
5757
#include "utils/tuplesort.h"

‎src/backend/regex/regerror.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ static const struct rerr
4646

4747
{
4848
/* the actual table is built from regex.h */
49-
#include "regex/regerrs.h" /* pgrminclude ignore */
49+
#include "regex/regerrs.h"
5050
{
5151
-1, "", "oops"
5252
}, /* explanation special-cased in code */

‎src/backend/utils/adt/inet_net_pton.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ static const char rcsid[] = "Id: inet_net_pton.c,v 1.4.2.3 2004/03/17 00:40:11 m
2929
#include <assert.h>
3030
#include <ctype.h>
3131

32-
#include "utils/builtins.h" /* pgrminclude ignore */ /* needed on some
33-
* platforms */
32+
#include "utils/builtins.h" /* needed on some platforms */
3433
#include "utils/inet.h"
3534

3635

‎src/bin/initdb/initdb.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@
6666

6767
#include "access/xlog_internal.h"
6868
#include "catalog/pg_authid_d.h"
69-
#include "catalog/pg_class_d.h" /* pgrminclude ignore */
69+
#include "catalog/pg_class_d.h"
7070
#include "catalog/pg_collation_d.h"
71-
#include "catalog/pg_database_d.h" /* pgrminclude ignore */
71+
#include "catalog/pg_database_d.h"
7272
#include "common/file_perm.h"
7373
#include "common/file_utils.h"
7474
#include "common/logging.h"

‎src/bin/pg_amcheck/pg_amcheck.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include "fe_utils/query_utils.h"
2727
#include "fe_utils/simple_list.h"
2828
#include "fe_utils/string_utils.h"
29-
#include "getopt_long.h" /* pgrminclude ignore */
29+
#include "getopt_long.h"
3030
#include "pgtime.h"
3131
#include "storage/block.h"
3232

‎src/bin/scripts/common.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111

1212
#include "common/username.h"
1313
#include "fe_utils/connect_utils.h"
14-
#include "getopt_long.h" /* pgrminclude ignore */
14+
#include "getopt_long.h"
1515
#include "libpq-fe.h"
16-
#include "pqexpbuffer.h" /* pgrminclude ignore */
16+
#include "pqexpbuffer.h"
1717

1818
extern void splitTableColumnsSpec(const char *spec, int encoding,
1919
char **table, const char **columns);

‎src/include/common/ip.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <netdb.h>
1818
#include <sys/socket.h>
1919

20-
#include "libpq/pqcomm.h" /* pgrminclude ignore */
20+
#include "libpq/pqcomm.h"
2121

2222

2323
extern int pg_getaddrinfo_all(const char *hostname, const char *servname,

‎src/include/common/relpath.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
#define RELPATH_H
1515

1616
/*
17-
* 'pgrminclude ignore' needed here because CppAsString2() does not throw
18-
* an error if the symbol is not defined.
17+
* Required here; note that CppAsString2() does not throw an error if the
18+
* symbol is not defined.
1919
*/
20-
#include "catalog/catversion.h" /* pgrminclude ignore */
20+
#include "catalog/catversion.h"
2121

2222
/*
2323
* RelFileNumber data type identifies the specific relation file name.

‎src/include/libpq/hba.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#ifndef HBA_H
1212
#define HBA_H
1313

14-
#include "libpq/pqcomm.h" /* pgrminclude ignore */ /* needed for NetBSD */
14+
#include "libpq/pqcomm.h" /* needed for NetBSD */
1515
#include "nodes/pg_list.h"
1616
#include "regex/regex.h"
1717

‎src/include/libpq/ifaddr.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#ifndef IFADDR_H
1313
#define IFADDR_H
1414

15-
#include "libpq/pqcomm.h" /* pgrminclude ignore */
15+
#include "libpq/pqcomm.h"
1616

1717
typedef void (*PgIfAddrCallback) (struct sockaddr *addr,
1818
struct sockaddr *netmask,

‎src/include/pg_trace.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
#ifndef PG_TRACE_H
1313
#define PG_TRACE_H
1414

15-
#include "utils/probes.h" /* pgrminclude ignore */
15+
#include "utils/probes.h"
1616

1717
#endif /* PG_TRACE_H */

‎src/include/snowball/header.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#endif
3939

4040
/* Now we can include the original Snowball header.h */
41-
#include "snowball/libstemmer/header.h" /* pgrminclude ignore */
41+
#include "snowball/libstemmer/header.h"
4242

4343
/*
4444
* Redefine standard memory allocation interface to pgsql's one.

‎src/pl/plpgsql/src/pl_comp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ typedef struct
7979
} ExceptionLabelMap;
8080

8181
static const ExceptionLabelMap exception_label_map[] = {
82-
#include "plerrcodes.h" /* pgrminclude ignore */
82+
#include "plerrcodes.h"
8383
{NULL, 0}
8484
};
8585

‎src/pl/tcl/pltcl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ typedef struct
259259
} TclExceptionNameMap;
260260

261261
static const TclExceptionNameMap exception_name_map[] = {
262-
#include "pltclerrcodes.h" /* pgrminclude ignore */
262+
#include "pltclerrcodes.h"
263263
{NULL, 0}
264264
};
265265

0 commit comments

Comments
 (0)