summaryrefslogtreecommitdiff
path: root/contrib/hstore
diff options
context:
space:
mode:
authorAmit Kapila <akapila@postgresql.org>2019-10-23 09:26:22 +0530
committerAmit Kapila <akapila@postgresql.org>2019-10-24 08:05:34 +0530
commit7e735035f208418f31b91846ae3e8a381edb3af3 (patch)
tree3e65f5f1c373f43e4ab7abaa49b30bfbafecb4d5 /contrib/hstore
parent59c2617af35f064e5d3ef39cfe94531f7459f3de (diff)
downloadpostgresql-7e735035f208418f31b91846ae3e8a381edb3af3.tar.gz
Make the order of the header file includes consistent in contrib modules.
The basic rule we follow here is to always first include 'postgres.h' or 'postgres_fe.h' whichever is applicable, then system header includes and then Postgres header includes.  In this, we also follow that all the Postgres header includes are in order based on their ASCII value.  We generally follow these rules, but the code has deviated in many places. This commit makes it consistent just for contrib modules. The later commits will enforce similar rules in other parts of code. Author: Vignesh C Reviewed-by: Amit Kapila Discussion: https://postgr.es/m/CALDaNm2Sznv8RR6Ex-iJO6xAdsxgWhCoETkaYX=+9DW3q0QCfA@mail.gmail.com
Diffstat (limited to 'contrib/hstore')
-rw-r--r--contrib/hstore/hstore_gist.c3
-rw-r--r--contrib/hstore/hstore_io.c3
-rw-r--r--contrib/hstore/hstore_op.c3
3 files changed, 3 insertions, 6 deletions
diff --git a/contrib/hstore/hstore_gist.c b/contrib/hstore/hstore_gist.c
index 6a885f2926..e860f1e4d3 100644
--- a/contrib/hstore/hstore_gist.c
+++ b/contrib/hstore/hstore_gist.c
@@ -6,9 +6,8 @@
#include "access/gist.h"
#include "access/stratnum.h"
#include "catalog/pg_type.h"
-#include "utils/pg_crc.h"
-
#include "hstore.h"
+#include "utils/pg_crc.h"
/* bigint defines */
#define BITBYTE 8
diff --git a/contrib/hstore/hstore_io.c b/contrib/hstore/hstore_io.c
index 745497c76f..be3cce4f74 100644
--- a/contrib/hstore/hstore_io.c
+++ b/contrib/hstore/hstore_io.c
@@ -8,6 +8,7 @@
#include "access/htup_details.h"
#include "catalog/pg_type.h"
#include "funcapi.h"
+#include "hstore.h"
#include "lib/stringinfo.h"
#include "libpq/pqformat.h"
#include "utils/builtins.h"
@@ -18,8 +19,6 @@
#include "utils/memutils.h"
#include "utils/typcache.h"
-#include "hstore.h"
-
PG_MODULE_MAGIC;
/* old names for C functions */
diff --git a/contrib/hstore/hstore_op.c b/contrib/hstore/hstore_op.c
index a3a8a91827..c54071b1a8 100644
--- a/contrib/hstore/hstore_op.c
+++ b/contrib/hstore/hstore_op.c
@@ -6,12 +6,11 @@
#include "access/htup_details.h"
#include "catalog/pg_type.h"
#include "funcapi.h"
+#include "hstore.h"
#include "utils/builtins.h"
#include "utils/hashutils.h"
#include "utils/memutils.h"
-#include "hstore.h"
-
/* old names for C functions */
HSTORE_POLLUTE(hstore_fetchval, fetchval);
HSTORE_POLLUTE(hstore_exists, exists);