aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/backend/access/brin/brin.c2
-rw-r--r--src/backend/access/nbtree/nbtsort.c2
-rw-r--r--src/backend/regex/regerror.c2
-rw-r--r--src/backend/utils/adt/inet_net_pton.c3
-rw-r--r--src/bin/initdb/initdb.c4
-rw-r--r--src/bin/pg_amcheck/pg_amcheck.c2
-rw-r--r--src/bin/scripts/common.h4
-rw-r--r--src/include/common/ip.h2
-rw-r--r--src/include/common/relpath.h6
-rw-r--r--src/include/libpq/hba.h2
-rw-r--r--src/include/libpq/ifaddr.h2
-rw-r--r--src/include/pg_trace.h2
-rw-r--r--src/include/snowball/header.h2
-rw-r--r--src/pl/plpgsql/src/pl_comp.c2
-rw-r--r--src/pl/tcl/pltcl.c2
15 files changed, 19 insertions, 20 deletions
diff --git a/src/backend/access/brin/brin.c b/src/backend/access/brin/brin.c
index 3aedec882cd..9af445cdcdd 100644
--- a/src/backend/access/brin/brin.c
+++ b/src/backend/access/brin/brin.c
@@ -33,7 +33,7 @@
#include "postmaster/autovacuum.h"
#include "storage/bufmgr.h"
#include "storage/freespace.h"
-#include "tcop/tcopprot.h" /* pgrminclude ignore */
+#include "tcop/tcopprot.h"
#include "utils/acl.h"
#include "utils/datum.h"
#include "utils/fmgrprotos.h"
diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c
index 17a352d040c..28522c0ac1c 100644
--- a/src/backend/access/nbtree/nbtsort.c
+++ b/src/backend/access/nbtree/nbtsort.c
@@ -51,7 +51,7 @@
#include "miscadmin.h"
#include "pgstat.h"
#include "storage/bulk_write.h"
-#include "tcop/tcopprot.h" /* pgrminclude ignore */
+#include "tcop/tcopprot.h"
#include "utils/rel.h"
#include "utils/sortsupport.h"
#include "utils/tuplesort.h"
diff --git a/src/backend/regex/regerror.c b/src/backend/regex/regerror.c
index 4a27c2552cb..c69aaf27747 100644
--- a/src/backend/regex/regerror.c
+++ b/src/backend/regex/regerror.c
@@ -46,7 +46,7 @@ static const struct rerr
{
/* the actual table is built from regex.h */
-#include "regex/regerrs.h" /* pgrminclude ignore */
+#include "regex/regerrs.h"
{
-1, "", "oops"
}, /* explanation special-cased in code */
diff --git a/src/backend/utils/adt/inet_net_pton.c b/src/backend/utils/adt/inet_net_pton.c
index d3221a13139..ef2236d9f04 100644
--- a/src/backend/utils/adt/inet_net_pton.c
+++ b/src/backend/utils/adt/inet_net_pton.c
@@ -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
#include <assert.h>
#include <ctype.h>
-#include "utils/builtins.h" /* pgrminclude ignore */ /* needed on some
- * platforms */
+#include "utils/builtins.h" /* needed on some platforms */
#include "utils/inet.h"
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index 49e8efd2125..1d012b255ac 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -66,9 +66,9 @@
#include "access/xlog_internal.h"
#include "catalog/pg_authid_d.h"
-#include "catalog/pg_class_d.h" /* pgrminclude ignore */
+#include "catalog/pg_class_d.h"
#include "catalog/pg_collation_d.h"
-#include "catalog/pg_database_d.h" /* pgrminclude ignore */
+#include "catalog/pg_database_d.h"
#include "common/file_perm.h"
#include "common/file_utils.h"
#include "common/logging.h"
diff --git a/src/bin/pg_amcheck/pg_amcheck.c b/src/bin/pg_amcheck/pg_amcheck.c
index 27a7d5e925e..a50a0268986 100644
--- a/src/bin/pg_amcheck/pg_amcheck.c
+++ b/src/bin/pg_amcheck/pg_amcheck.c
@@ -26,7 +26,7 @@
#include "fe_utils/query_utils.h"
#include "fe_utils/simple_list.h"
#include "fe_utils/string_utils.h"
-#include "getopt_long.h" /* pgrminclude ignore */
+#include "getopt_long.h"
#include "pgtime.h"
#include "storage/block.h"
diff --git a/src/bin/scripts/common.h b/src/bin/scripts/common.h
index 97f19986c3b..2f2cc9134e1 100644
--- a/src/bin/scripts/common.h
+++ b/src/bin/scripts/common.h
@@ -11,9 +11,9 @@
#include "common/username.h"
#include "fe_utils/connect_utils.h"
-#include "getopt_long.h" /* pgrminclude ignore */
+#include "getopt_long.h"
#include "libpq-fe.h"
-#include "pqexpbuffer.h" /* pgrminclude ignore */
+#include "pqexpbuffer.h"
extern void splitTableColumnsSpec(const char *spec, int encoding,
char **table, const char **columns);
diff --git a/src/include/common/ip.h b/src/include/common/ip.h
index 5648b6e5221..c8da1b316a4 100644
--- a/src/include/common/ip.h
+++ b/src/include/common/ip.h
@@ -17,7 +17,7 @@
#include <netdb.h>
#include <sys/socket.h>
-#include "libpq/pqcomm.h" /* pgrminclude ignore */
+#include "libpq/pqcomm.h"
extern int pg_getaddrinfo_all(const char *hostname, const char *servname,
diff --git a/src/include/common/relpath.h b/src/include/common/relpath.h
index 2dabbe01ecd..a267f67b446 100644
--- a/src/include/common/relpath.h
+++ b/src/include/common/relpath.h
@@ -14,10 +14,10 @@
#define RELPATH_H
/*
- * 'pgrminclude ignore' needed here because CppAsString2() does not throw
- * an error if the symbol is not defined.
+ * Required here; note that CppAsString2() does not throw an error if the
+ * symbol is not defined.
*/
-#include "catalog/catversion.h" /* pgrminclude ignore */
+#include "catalog/catversion.h"
/*
* RelFileNumber data type identifies the specific relation file name.
diff --git a/src/include/libpq/hba.h b/src/include/libpq/hba.h
index 8ea837ae82a..b20d0051f7d 100644
--- a/src/include/libpq/hba.h
+++ b/src/include/libpq/hba.h
@@ -11,7 +11,7 @@
#ifndef HBA_H
#define HBA_H
-#include "libpq/pqcomm.h" /* pgrminclude ignore */ /* needed for NetBSD */
+#include "libpq/pqcomm.h" /* needed for NetBSD */
#include "nodes/pg_list.h"
#include "regex/regex.h"
diff --git a/src/include/libpq/ifaddr.h b/src/include/libpq/ifaddr.h
index 5a117d4fe1f..73ad9cfafa8 100644
--- a/src/include/libpq/ifaddr.h
+++ b/src/include/libpq/ifaddr.h
@@ -12,7 +12,7 @@
#ifndef IFADDR_H
#define IFADDR_H
-#include "libpq/pqcomm.h" /* pgrminclude ignore */
+#include "libpq/pqcomm.h"
typedef void (*PgIfAddrCallback) (struct sockaddr *addr,
struct sockaddr *netmask,
diff --git a/src/include/pg_trace.h b/src/include/pg_trace.h
index bae819ab466..3d8cee56c47 100644
--- a/src/include/pg_trace.h
+++ b/src/include/pg_trace.h
@@ -12,6 +12,6 @@
#ifndef PG_TRACE_H
#define PG_TRACE_H
-#include "utils/probes.h" /* pgrminclude ignore */
+#include "utils/probes.h"
#endif /* PG_TRACE_H */
diff --git a/src/include/snowball/header.h b/src/include/snowball/header.h
index 0495fd53b63..51ba3e0da5b 100644
--- a/src/include/snowball/header.h
+++ b/src/include/snowball/header.h
@@ -38,7 +38,7 @@
#endif
/* Now we can include the original Snowball header.h */
-#include "snowball/libstemmer/header.h" /* pgrminclude ignore */
+#include "snowball/libstemmer/header.h"
/*
* Redefine standard memory allocation interface to pgsql's one.
diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c
index 6255a86d75b..d8c05ca95d3 100644
--- a/src/pl/plpgsql/src/pl_comp.c
+++ b/src/pl/plpgsql/src/pl_comp.c
@@ -79,7 +79,7 @@ typedef struct
} ExceptionLabelMap;
static const ExceptionLabelMap exception_label_map[] = {
-#include "plerrcodes.h" /* pgrminclude ignore */
+#include "plerrcodes.h"
{NULL, 0}
};
diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c
index e2d9246a678..feb6a76b56c 100644
--- a/src/pl/tcl/pltcl.c
+++ b/src/pl/tcl/pltcl.c
@@ -259,7 +259,7 @@ typedef struct
} TclExceptionNameMap;
static const TclExceptionNameMap exception_name_map[] = {
-#include "pltclerrcodes.h" /* pgrminclude ignore */
+#include "pltclerrcodes.h"
{NULL, 0}
};