diff options
| author | Amit Kapila | 2019-10-23 03:56:22 +0000 |
|---|---|---|
| committer | Amit Kapila | 2019-10-24 02:35:34 +0000 |
| commit | 7e735035f208418f31b91846ae3e8a381edb3af3 (patch) | |
| tree | 3e65f5f1c373f43e4ab7abaa49b30bfbafecb4d5 /contrib/pg_trgm | |
| parent | 59c2617af35f064e5d3ef39cfe94531f7459f3de (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/pg_trgm')
| -rw-r--r-- | contrib/pg_trgm/trgm_gin.c | 4 | ||||
| -rw-r--r-- | contrib/pg_trgm/trgm_gist.c | 4 | ||||
| -rw-r--r-- | contrib/pg_trgm/trgm_op.c | 3 | ||||
| -rw-r--r-- | contrib/pg_trgm/trgm_regexp.c | 4 |
4 files changed, 4 insertions, 11 deletions
diff --git a/contrib/pg_trgm/trgm_gin.c b/contrib/pg_trgm/trgm_gin.c index 1b9809b565a..4dbf0ffb68a 100644 --- a/contrib/pg_trgm/trgm_gin.c +++ b/contrib/pg_trgm/trgm_gin.c @@ -3,12 +3,10 @@ */ #include "postgres.h" -#include "trgm.h" - #include "access/gin.h" #include "access/stratnum.h" #include "fmgr.h" - +#include "trgm.h" PG_FUNCTION_INFO_V1(gin_extract_trgm); PG_FUNCTION_INFO_V1(gin_extract_value_trgm); diff --git a/contrib/pg_trgm/trgm_gist.c b/contrib/pg_trgm/trgm_gist.c index e79db8a4f03..e022d0b7993 100644 --- a/contrib/pg_trgm/trgm_gist.c +++ b/contrib/pg_trgm/trgm_gist.c @@ -3,12 +3,10 @@ */ #include "postgres.h" -#include "trgm.h" - #include "access/stratnum.h" #include "fmgr.h" #include "port/pg_bitutils.h" - +#include "trgm.h" typedef struct { diff --git a/contrib/pg_trgm/trgm_op.c b/contrib/pg_trgm/trgm_op.c index 0d4614e9c8a..4679efe6568 100644 --- a/contrib/pg_trgm/trgm_op.c +++ b/contrib/pg_trgm/trgm_op.c @@ -5,9 +5,8 @@ #include <ctype.h> -#include "trgm.h" - #include "catalog/pg_type.h" +#include "trgm.h" #include "tsearch/ts_locale.h" #include "utils/lsyscache.h" #include "utils/memutils.h" diff --git a/contrib/pg_trgm/trgm_regexp.c b/contrib/pg_trgm/trgm_regexp.c index 3ad5731ae80..7965a29c9f9 100644 --- a/contrib/pg_trgm/trgm_regexp.c +++ b/contrib/pg_trgm/trgm_regexp.c @@ -191,14 +191,12 @@ */ #include "postgres.h" -#include "trgm.h" - #include "regex/regexport.h" +#include "trgm.h" #include "tsearch/ts_locale.h" #include "utils/hsearch.h" #include "utils/memutils.h" - /* * Uncomment (or use -DTRGM_REGEXP_DEBUG) to print debug info, * for exploring and debugging the algorithm implementation. |