Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Kapila2019-10-23 03:56:22 +0000
committerAmit Kapila2019-10-24 02:35:34 +0000
commit7e735035f208418f31b91846ae3e8a381edb3af3 (patch)
tree3e65f5f1c373f43e4ab7abaa49b30bfbafecb4d5 /contrib/btree_gist
parent59c2617af35f064e5d3ef39cfe94531f7459f3de (diff)
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/btree_gist')
-rw-r--r--contrib/btree_gist/btree_enum.c4
-rw-r--r--contrib/btree_gist/btree_inet.c2
-rw-r--r--contrib/btree_gist/btree_numeric.c3
-rw-r--r--contrib/btree_gist/btree_utils_var.c5
4 files changed, 6 insertions, 8 deletions
diff --git a/contrib/btree_gist/btree_enum.c b/contrib/btree_gist/btree_enum.c
index 0ec7d8bf884..b56301270f7 100644
--- a/contrib/btree_gist/btree_enum.c
+++ b/contrib/btree_gist/btree_enum.c
@@ -2,11 +2,11 @@
* contrib/btree_gist/btree_enum.c
*/
#include "postgres.h"
-#include "fmgr.h"
-#include "utils/builtins.h"
#include "btree_gist.h"
#include "btree_utils_num.h"
+#include "fmgr.h"
+#include "utils/builtins.h"
/* enums are really Oids, so we just use the same structure */
diff --git a/contrib/btree_gist/btree_inet.c b/contrib/btree_gist/btree_inet.c
index 34308cc6408..a3b4301c49a 100644
--- a/contrib/btree_gist/btree_inet.c
+++ b/contrib/btree_gist/btree_inet.c
@@ -5,9 +5,9 @@
#include "btree_gist.h"
#include "btree_utils_num.h"
+#include "catalog/pg_type.h"
#include "utils/builtins.h"
#include "utils/inet.h"
-#include "catalog/pg_type.h"
typedef struct inetkey
{
diff --git a/contrib/btree_gist/btree_numeric.c b/contrib/btree_gist/btree_numeric.c
index b72060cdb6e..d43612a8734 100644
--- a/contrib/btree_gist/btree_numeric.c
+++ b/contrib/btree_gist/btree_numeric.c
@@ -3,11 +3,10 @@
*/
#include "postgres.h"
-#include "btree_gist.h"
-
#include <math.h>
#include <float.h>
+#include "btree_gist.h"
#include "btree_utils_var.h"
#include "utils/builtins.h"
#include "utils/numeric.h"
diff --git a/contrib/btree_gist/btree_utils_var.c b/contrib/btree_gist/btree_utils_var.c
index 670c879e775..452241f6977 100644
--- a/contrib/btree_gist/btree_utils_var.c
+++ b/contrib/btree_gist/btree_utils_var.c
@@ -3,15 +3,14 @@
*/
#include "postgres.h"
-#include "btree_gist.h"
-
#include <math.h>
#include <limits.h>
#include <float.h>
+#include "btree_gist.h"
#include "btree_utils_var.h"
-#include "utils/pg_locale.h"
#include "utils/builtins.h"
+#include "utils/pg_locale.h"
#include "utils/rel.h"
/* used for key sorting */