diff options
85 files changed, 115 insertions, 183 deletions
diff --git a/contrib/bloom/blcost.c b/contrib/bloom/blcost.c index f9fe57fb845..b2cd6499984 100644 --- a/contrib/bloom/blcost.c +++ b/contrib/bloom/blcost.c @@ -12,11 +12,10 @@ */ #include "postgres.h" +#include "bloom.h" #include "fmgr.h" #include "utils/selfuncs.h" -#include "bloom.h" - /* * Estimate cost of bloom index scan. */ diff --git a/contrib/bloom/blinsert.c b/contrib/bloom/blinsert.c index 4b2186b8dda..30d17f501db 100644 --- a/contrib/bloom/blinsert.c +++ b/contrib/bloom/blinsert.c @@ -15,6 +15,7 @@ #include "access/genam.h" #include "access/generic_xlog.h" #include "access/tableam.h" +#include "bloom.h" #include "catalog/index.h" #include "miscadmin.h" #include "storage/bufmgr.h" @@ -23,8 +24,6 @@ #include "utils/memutils.h" #include "utils/rel.h" -#include "bloom.h" - PG_MODULE_MAGIC; /* diff --git a/contrib/bloom/blscan.c b/contrib/bloom/blscan.c index 49e364ac12d..30fa20619bb 100644 --- a/contrib/bloom/blscan.c +++ b/contrib/bloom/blscan.c @@ -13,15 +13,14 @@ #include "postgres.h" #include "access/relscan.h" -#include "pgstat.h" +#include "bloom.h" #include "miscadmin.h" +#include "pgstat.h" #include "storage/bufmgr.h" #include "storage/lmgr.h" #include "utils/memutils.h" #include "utils/rel.h" -#include "bloom.h" - /* * Begin scan of bloom index. */ diff --git a/contrib/bloom/blutils.c b/contrib/bloom/blutils.c index dbb24cb5b24..3d44616adcf 100644 --- a/contrib/bloom/blutils.c +++ b/contrib/bloom/blutils.c @@ -15,17 +15,15 @@ #include "access/amapi.h" #include "access/generic_xlog.h" +#include "access/reloptions.h" +#include "bloom.h" #include "catalog/index.h" -#include "storage/lmgr.h" #include "miscadmin.h" #include "storage/bufmgr.h" -#include "storage/indexfsm.h" -#include "utils/memutils.h" -#include "access/reloptions.h" #include "storage/freespace.h" #include "storage/indexfsm.h" - -#include "bloom.h" +#include "storage/lmgr.h" +#include "utils/memutils.h" /* Signature dealing macros - note i is assumed to be of type int */ #define GETWORD(x,i) ( *( (BloomSignatureWord *)(x) + ( (i) / SIGNWORDBITS ) ) ) diff --git a/contrib/bloom/blvalidate.c b/contrib/bloom/blvalidate.c index e9bd1b4f03e..b3dfe030226 100644 --- a/contrib/bloom/blvalidate.c +++ b/contrib/bloom/blvalidate.c @@ -14,6 +14,7 @@ #include "access/amvalidate.h" #include "access/htup_details.h" +#include "bloom.h" #include "catalog/pg_amop.h" #include "catalog/pg_amproc.h" #include "catalog/pg_opclass.h" @@ -24,8 +25,6 @@ #include "utils/regproc.h" #include "utils/syscache.h" -#include "bloom.h" - /* * Validator for a bloom opclass. */ diff --git a/contrib/btree_gin/btree_gin.c b/contrib/btree_gin/btree_gin.c index 2ecf7a2d87c..0ed3d580df1 100644 --- a/contrib/btree_gin/btree_gin.c +++ b/contrib/btree_gin/btree_gin.c @@ -14,8 +14,8 @@ #include "utils/inet.h" #include "utils/numeric.h" #include "utils/timestamp.h" -#include "utils/varbit.h" #include "utils/uuid.h" +#include "utils/varbit.h" PG_MODULE_MAGIC; 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 */ diff --git a/contrib/cube/cube.c b/contrib/cube/cube.c index b7203668760..b98118e367b 100644 --- a/contrib/cube/cube.c +++ b/contrib/cube/cube.c @@ -12,11 +12,10 @@ #include "access/gist.h" #include "access/stratnum.h" +#include "cubedata.h" #include "utils/array.h" #include "utils/float.h" -#include "cubedata.h" - PG_MODULE_MAGIC; /* diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c index e432457e2d5..54b7bf952f3 100644 --- a/contrib/dblink/dblink.c +++ b/contrib/dblink/dblink.c @@ -34,8 +34,6 @@ #include <limits.h> -#include "libpq-fe.h" - #include "access/htup_details.h" #include "access/relation.h" #include "access/reloptions.h" @@ -50,6 +48,7 @@ #include "foreign/foreign.h" #include "funcapi.h" #include "lib/stringinfo.h" +#include "libpq-fe.h" #include "mb/pg_wchar.h" #include "miscadmin.h" #include "parser/scansup.h" diff --git a/contrib/hstore/hstore_gist.c b/contrib/hstore/hstore_gist.c index 6a885f2926f..e860f1e4d35 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 745497c76f0..be3cce4f740 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 a3a8a918274..c54071b1a88 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); diff --git a/contrib/hstore_plpython/hstore_plpython.c b/contrib/hstore_plpython/hstore_plpython.c index 93705f0d54c..4dee5697403 100644 --- a/contrib/hstore_plpython/hstore_plpython.c +++ b/contrib/hstore_plpython/hstore_plpython.c @@ -1,9 +1,9 @@ #include "postgres.h" #include "fmgr.h" -#include "plpython.h" -#include "plpy_typeio.h" #include "hstore/hstore.h" +#include "plpy_typeio.h" +#include "plpython.h" PG_MODULE_MAGIC; diff --git a/contrib/intarray/_int_bool.c b/contrib/intarray/_int_bool.c index 91e2a804f2b..fd976900b8a 100644 --- a/contrib/intarray/_int_bool.c +++ b/contrib/intarray/_int_bool.c @@ -3,11 +3,10 @@ */ #include "postgres.h" +#include "_int.h" #include "miscadmin.h" #include "utils/builtins.h" -#include "_int.h" - PG_FUNCTION_INFO_V1(bqarr_in); PG_FUNCTION_INFO_V1(bqarr_out); PG_FUNCTION_INFO_V1(boolop); diff --git a/contrib/intarray/_int_gin.c b/contrib/intarray/_int_gin.c index 7aebfec54b2..b7958d8eca5 100644 --- a/contrib/intarray/_int_gin.c +++ b/contrib/intarray/_int_gin.c @@ -3,11 +3,10 @@ */ #include "postgres.h" +#include "_int.h" #include "access/gin.h" #include "access/stratnum.h" -#include "_int.h" - PG_FUNCTION_INFO_V1(ginint4_queryextract); Datum diff --git a/contrib/intarray/_int_gist.c b/contrib/intarray/_int_gist.c index e5a8011daf8..50effc3ca57 100644 --- a/contrib/intarray/_int_gist.c +++ b/contrib/intarray/_int_gist.c @@ -5,11 +5,10 @@ #include <limits.h> +#include "_int.h" #include "access/gist.h" #include "access/stratnum.h" -#include "_int.h" - #define GETENTRY(vec,pos) ((ArrayType *) DatumGetPointer((vec)->vector[(pos)].key)) /* diff --git a/contrib/intarray/_int_op.c b/contrib/intarray/_int_op.c index fe7fcc4662e..0e3dcb467f6 100644 --- a/contrib/intarray/_int_op.c +++ b/contrib/intarray/_int_op.c @@ -3,7 +3,6 @@ */ #include "postgres.h" - #include "_int.h" PG_MODULE_MAGIC; diff --git a/contrib/intarray/_int_selfuncs.c b/contrib/intarray/_int_selfuncs.c index aebffae66c2..8fb05d16972 100644 --- a/contrib/intarray/_int_selfuncs.c +++ b/contrib/intarray/_int_selfuncs.c @@ -13,17 +13,17 @@ *------------------------------------------------------------------------- */ #include "postgres.h" -#include "_int.h" +#include "_int.h" #include "access/htup_details.h" #include "catalog/pg_operator.h" #include "catalog/pg_statistic.h" #include "catalog/pg_type.h" +#include "miscadmin.h" #include "utils/builtins.h" +#include "utils/lsyscache.h" #include "utils/selfuncs.h" #include "utils/syscache.h" -#include "utils/lsyscache.h" -#include "miscadmin.h" PG_FUNCTION_INFO_V1(_int_overlap_sel); PG_FUNCTION_INFO_V1(_int_contains_sel); diff --git a/contrib/intarray/_int_tool.c b/contrib/intarray/_int_tool.c index fde8d15e2c2..efff81d77dc 100644 --- a/contrib/intarray/_int_tool.c +++ b/contrib/intarray/_int_tool.c @@ -5,10 +5,8 @@ #include <limits.h> -#include "catalog/pg_type.h" - #include "_int.h" - +#include "catalog/pg_type.h" /* arguments are assumed sorted & unique-ified */ bool diff --git a/contrib/intarray/_intbig_gist.c b/contrib/intarray/_intbig_gist.c index 2a20abecc6c..be51dac1fa7 100644 --- a/contrib/intarray/_intbig_gist.c +++ b/contrib/intarray/_intbig_gist.c @@ -3,12 +3,11 @@ */ #include "postgres.h" +#include "_int.h" #include "access/gist.h" #include "access/stratnum.h" #include "port/pg_bitutils.h" -#include "_int.h" - #define GETENTRY(vec,pos) ((GISTTYPE *) DatumGetPointer((vec)->vector[(pos)].key)) /* ** _intbig methods diff --git a/contrib/isn/isn.c b/contrib/isn/isn.c index 0c2cac7d52b..f4d933ced73 100644 --- a/contrib/isn/isn.c +++ b/contrib/isn/isn.c @@ -14,15 +14,14 @@ #include "postgres.h" -#include "fmgr.h" -#include "utils/builtins.h" - -#include "isn.h" #include "EAN13.h" #include "ISBN.h" #include "ISMN.h" #include "ISSN.h" #include "UPC.h" +#include "fmgr.h" +#include "isn.h" +#include "utils/builtins.h" PG_MODULE_MAGIC; diff --git a/contrib/jsonb_plperl/jsonb_plperl.c b/contrib/jsonb_plperl/jsonb_plperl.c index 04b04df953f..4ae13532d13 100644 --- a/contrib/jsonb_plperl/jsonb_plperl.c +++ b/contrib/jsonb_plperl/jsonb_plperl.c @@ -5,8 +5,8 @@ #include "fmgr.h" #include "plperl.h" #include "plperl_helpers.h" -#include "utils/jsonb.h" #include "utils/fmgrprotos.h" +#include "utils/jsonb.h" PG_MODULE_MAGIC; diff --git a/contrib/jsonb_plpython/jsonb_plpython.c b/contrib/jsonb_plpython/jsonb_plpython.c index 776cf7c8b9b..ecaa4c6f92b 100644 --- a/contrib/jsonb_plpython/jsonb_plpython.c +++ b/contrib/jsonb_plpython/jsonb_plpython.c @@ -1,10 +1,10 @@ #include "postgres.h" -#include "plpython.h" #include "plpy_elog.h" #include "plpy_typeio.h" -#include "utils/jsonb.h" +#include "plpython.h" #include "utils/fmgrprotos.h" +#include "utils/jsonb.h" #include "utils/numeric.h" PG_MODULE_MAGIC; diff --git a/contrib/ltree/_ltree_gist.c b/contrib/ltree/_ltree_gist.c index c33ac4eedd2..6b14ed5150a 100644 --- a/contrib/ltree/_ltree_gist.c +++ b/contrib/ltree/_ltree_gist.c @@ -9,11 +9,9 @@ #include "access/gist.h" #include "access/stratnum.h" -#include "port/pg_bitutils.h" - #include "crc32.h" #include "ltree.h" - +#include "port/pg_bitutils.h" PG_FUNCTION_INFO_V1(_ltree_compress); PG_FUNCTION_INFO_V1(_ltree_same); diff --git a/contrib/ltree/crc32.c b/contrib/ltree/crc32.c index 447e4b29602..0c3e45923b2 100644 --- a/contrib/ltree/crc32.c +++ b/contrib/ltree/crc32.c @@ -16,8 +16,8 @@ #define TOLOWER(x) (x) #endif -#include "utils/pg_crc.h" #include "crc32.h" +#include "utils/pg_crc.h" unsigned int ltree_crc32_sz(char *buf, int size) diff --git a/contrib/ltree/lquery_op.c b/contrib/ltree/lquery_op.c index 62172d5ea14..fa47710439b 100644 --- a/contrib/ltree/lquery_op.c +++ b/contrib/ltree/lquery_op.c @@ -8,8 +8,8 @@ #include <ctype.h> #include "catalog/pg_collation.h" -#include "utils/formatting.h" #include "ltree.h" +#include "utils/formatting.h" PG_FUNCTION_INFO_V1(ltq_regex); PG_FUNCTION_INFO_V1(ltq_rregex); diff --git a/contrib/ltree/ltree_io.c b/contrib/ltree/ltree_io.c index f54f0374436..900a46a9e7d 100644 --- a/contrib/ltree/ltree_io.c +++ b/contrib/ltree/ltree_io.c @@ -7,9 +7,9 @@ #include <ctype.h> +#include "crc32.h" #include "ltree.h" #include "utils/memutils.h" -#include "crc32.h" PG_FUNCTION_INFO_V1(ltree_in); PG_FUNCTION_INFO_V1(ltree_out); diff --git a/contrib/ltree/ltree_op.c b/contrib/ltree/ltree_op.c index df61c63180c..070868f25af 100644 --- a/contrib/ltree/ltree_op.c +++ b/contrib/ltree/ltree_op.c @@ -9,10 +9,10 @@ #include "access/htup_details.h" #include "catalog/pg_statistic.h" +#include "ltree.h" #include "utils/builtins.h" #include "utils/lsyscache.h" #include "utils/selfuncs.h" -#include "ltree.h" PG_MODULE_MAGIC; diff --git a/contrib/ltree_plpython/ltree_plpython.c b/contrib/ltree_plpython/ltree_plpython.c index b254aa558d1..1570e77dd9f 100644 --- a/contrib/ltree_plpython/ltree_plpython.c +++ b/contrib/ltree_plpython/ltree_plpython.c @@ -1,8 +1,8 @@ #include "postgres.h" #include "fmgr.h" -#include "plpython.h" #include "ltree/ltree.h" +#include "plpython.h" PG_MODULE_MAGIC; diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c index fa1e7959e77..9a3eac2ae6d 100644 --- a/contrib/oid2name/oid2name.c +++ b/contrib/oid2name/oid2name.c @@ -10,13 +10,11 @@ #include "postgres_fe.h" #include "catalog/pg_class_d.h" - #include "common/logging.h" #include "fe_utils/connect.h" +#include "getopt_long.h" #include "libpq-fe.h" #include "pg_getopt.h" -#include "getopt_long.h" - /* an extensible array to keep track of elements to show */ typedef struct diff --git a/contrib/pageinspect/brinfuncs.c b/contrib/pageinspect/brinfuncs.c index 04140eccb84..d0a12f1fc9b 100644 --- a/contrib/pageinspect/brinfuncs.c +++ b/contrib/pageinspect/brinfuncs.c @@ -9,24 +9,22 @@ */ #include "postgres.h" -#include "pageinspect.h" - -#include "access/htup_details.h" #include "access/brin.h" #include "access/brin_internal.h" #include "access/brin_page.h" #include "access/brin_revmap.h" #include "access/brin_tuple.h" +#include "access/htup_details.h" #include "catalog/index.h" #include "catalog/pg_type.h" #include "funcapi.h" #include "lib/stringinfo.h" +#include "miscadmin.h" +#include "pageinspect.h" #include "utils/array.h" #include "utils/builtins.h" #include "utils/lsyscache.h" #include "utils/rel.h" -#include "miscadmin.h" - PG_FUNCTION_INFO_V1(brin_page_type); PG_FUNCTION_INFO_V1(brin_page_items); diff --git a/contrib/pageinspect/btreefuncs.c b/contrib/pageinspect/btreefuncs.c index 8d27c9b0f6f..78cdc69ec7e 100644 --- a/contrib/pageinspect/btreefuncs.c +++ b/contrib/pageinspect/btreefuncs.c @@ -27,19 +27,17 @@ #include "postgres.h" -#include "pageinspect.h" - #include "access/nbtree.h" #include "access/relation.h" #include "catalog/namespace.h" #include "catalog/pg_am.h" #include "funcapi.h" #include "miscadmin.h" +#include "pageinspect.h" #include "utils/builtins.h" #include "utils/rel.h" #include "utils/varlena.h" - PG_FUNCTION_INFO_V1(bt_metap); PG_FUNCTION_INFO_V1(bt_page_items); PG_FUNCTION_INFO_V1(bt_page_items_bytea); diff --git a/contrib/pageinspect/fsmfuncs.c b/contrib/pageinspect/fsmfuncs.c index 4b3c5968184..8567a382b64 100644 --- a/contrib/pageinspect/fsmfuncs.c +++ b/contrib/pageinspect/fsmfuncs.c @@ -19,11 +19,10 @@ #include "postgres.h" -#include "pageinspect.h" - #include "funcapi.h" #include "lib/stringinfo.h" #include "miscadmin.h" +#include "pageinspect.h" #include "storage/fsm_internals.h" #include "utils/builtins.h" diff --git a/contrib/pageinspect/ginfuncs.c b/contrib/pageinspect/ginfuncs.c index 229f9f9a2ee..a2cd9edc07c 100644 --- a/contrib/pageinspect/ginfuncs.c +++ b/contrib/pageinspect/ginfuncs.c @@ -9,8 +9,6 @@ */ #include "postgres.h" -#include "pageinspect.h" - #include "access/gin.h" #include "access/gin_private.h" #include "access/htup_details.h" @@ -18,6 +16,7 @@ #include "catalog/pg_type.h" #include "funcapi.h" #include "miscadmin.h" +#include "pageinspect.h" #include "utils/array.h" #include "utils/builtins.h" #include "utils/rel.h" diff --git a/contrib/pageinspect/hashfuncs.c b/contrib/pageinspect/hashfuncs.c index 9374c4aabc4..bcc39a8a89c 100644 --- a/contrib/pageinspect/hashfuncs.c +++ b/contrib/pageinspect/hashfuncs.c @@ -10,14 +10,13 @@ #include "postgres.h" -#include "pageinspect.h" - #include "access/hash.h" #include "access/htup_details.h" -#include "catalog/pg_type.h" #include "catalog/pg_am.h" +#include "catalog/pg_type.h" #include "funcapi.h" #include "miscadmin.h" +#include "pageinspect.h" #include "utils/array.h" #include "utils/builtins.h" #include "utils/rel.h" diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c index 02e2ab9997a..8e69cb3fbdb 100644 --- a/contrib/pageinspect/heapfuncs.c +++ b/contrib/pageinspect/heapfuncs.c @@ -25,14 +25,13 @@ #include "postgres.h" -#include "pageinspect.h" - #include "access/htup_details.h" #include "access/relation.h" -#include "funcapi.h" #include "catalog/pg_am_d.h" #include "catalog/pg_type.h" +#include "funcapi.h" #include "miscadmin.h" +#include "pageinspect.h" #include "port/pg_bitutils.h" #include "utils/array.h" #include "utils/builtins.h" diff --git a/contrib/pageinspect/rawpage.c b/contrib/pageinspect/rawpage.c index f08f62f72da..ffb4418b1e0 100644 --- a/contrib/pageinspect/rawpage.c +++ b/contrib/pageinspect/rawpage.c @@ -15,14 +15,13 @@ #include "postgres.h" -#include "pageinspect.h" - #include "access/htup_details.h" #include "access/relation.h" #include "catalog/namespace.h" #include "catalog/pg_type.h" #include "funcapi.h" #include "miscadmin.h" +#include "pageinspect.h" #include "storage/bufmgr.h" #include "storage/checksum.h" #include "utils/builtins.h" diff --git a/contrib/passwordcheck/passwordcheck.c b/contrib/passwordcheck/passwordcheck.c index c3fb5a9c085..6810cabc93b 100644 --- a/contrib/passwordcheck/passwordcheck.c +++ b/contrib/passwordcheck/passwordcheck.c @@ -21,8 +21,8 @@ #endif #include "commands/user.h" -#include "libpq/crypt.h" #include "fmgr.h" +#include "libpq/crypt.h" PG_MODULE_MAGIC; diff --git a/contrib/pg_standby/pg_standby.c b/contrib/pg_standby/pg_standby.c index 9fae146dd64..c6beea70705 100644 --- a/contrib/pg_standby/pg_standby.c +++ b/contrib/pg_standby/pg_standby.c @@ -30,9 +30,8 @@ #include <signal.h> #include <sys/time.h> -#include "pg_getopt.h" - #include "access/xlog_internal.h" +#include "pg_getopt.h" const char *progname; 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. diff --git a/contrib/pgcrypto/crypt-md5.c b/contrib/pgcrypto/crypt-md5.c index 6a09d76989f..b6466d3e317 100644 --- a/contrib/pgcrypto/crypt-md5.c +++ b/contrib/pgcrypto/crypt-md5.c @@ -8,8 +8,8 @@ #include "postgres.h" -#include "px.h" #include "px-crypt.h" +#include "px.h" #define MD5_SIZE 16 diff --git a/contrib/pgcrypto/internal.c b/contrib/pgcrypto/internal.c index db58408d4c7..a12d7b41783 100644 --- a/contrib/pgcrypto/internal.c +++ b/contrib/pgcrypto/internal.c @@ -33,11 +33,11 @@ #include <time.h> -#include "px.h" -#include "md5.h" -#include "sha1.h" #include "blf.h" +#include "md5.h" +#include "px.h" #include "rijndael.h" +#include "sha1.h" #ifndef MD5_DIGEST_LENGTH #define MD5_DIGEST_LENGTH 16 diff --git a/contrib/pgcrypto/mbuf.c b/contrib/pgcrypto/mbuf.c index 73dbfbd08fc..0467212a281 100644 --- a/contrib/pgcrypto/mbuf.c +++ b/contrib/pgcrypto/mbuf.c @@ -31,8 +31,8 @@ #include "postgres.h" -#include "px.h" #include "mbuf.h" +#include "px.h" #define STEP (16*1024) diff --git a/contrib/pgcrypto/openssl.c b/contrib/pgcrypto/openssl.c index 7d686f39402..3057afb3390 100644 --- a/contrib/pgcrypto/openssl.c +++ b/contrib/pgcrypto/openssl.c @@ -31,12 +31,11 @@ #include "postgres.h" -#include "px.h" - #include <openssl/evp.h> #include <openssl/err.h> #include <openssl/rand.h> +#include "px.h" #include "utils/memutils.h" #include "utils/resowner.h" diff --git a/contrib/pgcrypto/pgcrypto.c b/contrib/pgcrypto/pgcrypto.c index f69ae107c3a..f0ac625040e 100644 --- a/contrib/pgcrypto/pgcrypto.c +++ b/contrib/pgcrypto/pgcrypto.c @@ -34,13 +34,12 @@ #include <ctype.h> #include "parser/scansup.h" +#include "pgcrypto.h" +#include "px-crypt.h" +#include "px.h" #include "utils/builtins.h" #include "utils/uuid.h" -#include "px.h" -#include "px-crypt.h" -#include "pgcrypto.h" - PG_MODULE_MAGIC; /* private stuff */ diff --git a/contrib/pgcrypto/pgp-armor.c b/contrib/pgcrypto/pgp-armor.c index aa5b563a31a..679779a6ac2 100644 --- a/contrib/pgcrypto/pgp-armor.c +++ b/contrib/pgcrypto/pgp-armor.c @@ -31,8 +31,8 @@ #include "postgres.h" -#include "px.h" #include "pgp.h" +#include "px.h" /* * BASE64 - duplicated :( diff --git a/contrib/pgcrypto/pgp-cfb.c b/contrib/pgcrypto/pgp-cfb.c index 1d99915f9db..8ae7c8608fb 100644 --- a/contrib/pgcrypto/pgp-cfb.c +++ b/contrib/pgcrypto/pgp-cfb.c @@ -31,8 +31,8 @@ #include "postgres.h" -#include "px.h" #include "pgp.h" +#include "px.h" typedef int (*mix_data_t) (PGP_CFB *ctx, const uint8 *data, int len, uint8 *dst); diff --git a/contrib/pgcrypto/pgp-compress.c b/contrib/pgcrypto/pgp-compress.c index 2adaf2c8755..0505bdee923 100644 --- a/contrib/pgcrypto/pgp-compress.c +++ b/contrib/pgcrypto/pgp-compress.c @@ -31,9 +31,8 @@ #include "postgres.h" -#include "px.h" #include "pgp.h" - +#include "px.h" /* * Compressed pkt writer diff --git a/contrib/pgcrypto/pgp-decrypt.c b/contrib/pgcrypto/pgp-decrypt.c index 4c43eb7e3ef..3ecbf9c0c25 100644 --- a/contrib/pgcrypto/pgp-decrypt.c +++ b/contrib/pgcrypto/pgp-decrypt.c @@ -31,9 +31,9 @@ #include "postgres.h" -#include "px.h" #include "mbuf.h" #include "pgp.h" +#include "px.h" #define NO_CTX_SIZE 0 #define ALLOW_CTX_SIZE 1 diff --git a/contrib/pgcrypto/pgp-encrypt.c b/contrib/pgcrypto/pgp-encrypt.c index 2938b4b3f5e..46518942ac2 100644 --- a/contrib/pgcrypto/pgp-encrypt.c +++ b/contrib/pgcrypto/pgp-encrypt.c @@ -34,9 +34,8 @@ #include <time.h> #include "mbuf.h" -#include "px.h" #include "pgp.h" - +#include "px.h" #define MDC_DIGEST_LEN 20 #define STREAM_ID 0xE0 diff --git a/contrib/pgcrypto/pgp-info.c b/contrib/pgcrypto/pgp-info.c index 9bfbbe6d0c9..b2300ea6568 100644 --- a/contrib/pgcrypto/pgp-info.c +++ b/contrib/pgcrypto/pgp-info.c @@ -30,9 +30,9 @@ */ #include "postgres.h" -#include "px.h" #include "mbuf.h" #include "pgp.h" +#include "px.h" static int read_pubkey_keyid(PullFilter *pkt, uint8 *keyid_buf) diff --git a/contrib/pgcrypto/pgp-mpi-internal.c b/contrib/pgcrypto/pgp-mpi-internal.c index c73f086b0be..2353a48a074 100644 --- a/contrib/pgcrypto/pgp-mpi-internal.c +++ b/contrib/pgcrypto/pgp-mpi-internal.c @@ -31,9 +31,8 @@ #include "postgres.h" #include "imath.h" - -#include "px.h" #include "pgp.h" +#include "px.h" static mpz_t * mp_new() diff --git a/contrib/pgcrypto/pgp-mpi-openssl.c b/contrib/pgcrypto/pgp-mpi-openssl.c index afece269186..75e4c8b3004 100644 --- a/contrib/pgcrypto/pgp-mpi-openssl.c +++ b/contrib/pgcrypto/pgp-mpi-openssl.c @@ -32,8 +32,8 @@ #include <openssl/bn.h> -#include "px.h" #include "pgp.h" +#include "px.h" static BIGNUM * mpi_to_bn(PGP_MPI *n) diff --git a/contrib/pgcrypto/pgp-mpi.c b/contrib/pgcrypto/pgp-mpi.c index 1da52acc9ad..36a6d361ab3 100644 --- a/contrib/pgcrypto/pgp-mpi.c +++ b/contrib/pgcrypto/pgp-mpi.c @@ -30,8 +30,8 @@ */ #include "postgres.h" -#include "px.h" #include "pgp.h" +#include "px.h" int pgp_mpi_alloc(int bits, PGP_MPI **mpi) diff --git a/contrib/pgcrypto/pgp-pgsql.c b/contrib/pgcrypto/pgp-pgsql.c index 3feadf7b702..8be895df80f 100644 --- a/contrib/pgcrypto/pgp-pgsql.c +++ b/contrib/pgcrypto/pgp-pgsql.c @@ -31,16 +31,15 @@ #include "postgres.h" -#include "lib/stringinfo.h" #include "catalog/pg_type.h" -#include "mb/pg_wchar.h" -#include "utils/builtins.h" -#include "utils/array.h" #include "funcapi.h" - +#include "lib/stringinfo.h" +#include "mb/pg_wchar.h" #include "mbuf.h" -#include "px.h" #include "pgp.h" +#include "px.h" +#include "utils/array.h" +#include "utils/builtins.h" /* * public functions diff --git a/contrib/pgcrypto/pgp-pubdec.c b/contrib/pgcrypto/pgp-pubdec.c index b925ff8599f..a0a5738a40e 100644 --- a/contrib/pgcrypto/pgp-pubdec.c +++ b/contrib/pgcrypto/pgp-pubdec.c @@ -30,8 +30,8 @@ */ #include "postgres.h" -#include "px.h" #include "pgp.h" +#include "px.h" /* * padded msg = 02 || PS || 00 || M diff --git a/contrib/pgcrypto/pgp-pubenc.c b/contrib/pgcrypto/pgp-pubenc.c index 08599f09786..9fdcf7c31c7 100644 --- a/contrib/pgcrypto/pgp-pubenc.c +++ b/contrib/pgcrypto/pgp-pubenc.c @@ -30,8 +30,8 @@ */ #include "postgres.h" -#include "px.h" #include "pgp.h" +#include "px.h" /* * padded msg: 02 || non-zero pad bytes || 00 || msg diff --git a/contrib/pgcrypto/pgp-pubkey.c b/contrib/pgcrypto/pgp-pubkey.c index f898d72ae99..d447e5fd4fe 100644 --- a/contrib/pgcrypto/pgp-pubkey.c +++ b/contrib/pgcrypto/pgp-pubkey.c @@ -30,9 +30,9 @@ */ #include "postgres.h" -#include "px.h" #include "mbuf.h" #include "pgp.h" +#include "px.h" int pgp_key_alloc(PGP_PubKey **pk_p) diff --git a/contrib/pgcrypto/pgp-s2k.c b/contrib/pgcrypto/pgp-s2k.c index 3f2f442ffcc..81ca1f094a1 100644 --- a/contrib/pgcrypto/pgp-s2k.c +++ b/contrib/pgcrypto/pgp-s2k.c @@ -31,9 +31,8 @@ #include "postgres.h" -#include "px.h" #include "pgp.h" - +#include "px.h" static int calc_s2k_simple(PGP_S2K *s2k, PX_MD *md, const uint8 *key, diff --git a/contrib/pgcrypto/pgp.c b/contrib/pgcrypto/pgp.c index dd8dae1b845..9b245fee61b 100644 --- a/contrib/pgcrypto/pgp.c +++ b/contrib/pgcrypto/pgp.c @@ -31,8 +31,8 @@ #include "postgres.h" -#include "px.h" #include "pgp.h" +#include "px.h" /* * Defaults. diff --git a/contrib/pgcrypto/px-crypt.c b/contrib/pgcrypto/px-crypt.c index 51be0b7da17..0913ff2c1bc 100644 --- a/contrib/pgcrypto/px-crypt.c +++ b/contrib/pgcrypto/px-crypt.c @@ -31,9 +31,8 @@ #include "postgres.h" -#include "px.h" #include "px-crypt.h" - +#include "px.h" static char * run_crypt_des(const char *psw, const char *salt, diff --git a/contrib/pgstattuple/pgstatapprox.c b/contrib/pgstattuple/pgstatapprox.c index 636c8d40aca..c17f244f836 100644 --- a/contrib/pgstattuple/pgstatapprox.c +++ b/contrib/pgstattuple/pgstatapprox.c @@ -13,12 +13,12 @@ #include "postgres.h" #include "access/heapam.h" +#include "access/htup_details.h" +#include "access/multixact.h" #include "access/relation.h" #include "access/transam.h" #include "access/visibilitymap.h" #include "access/xact.h" -#include "access/multixact.h" -#include "access/htup_details.h" #include "catalog/namespace.h" #include "catalog/pg_am_d.h" #include "commands/vacuum.h" @@ -26,8 +26,8 @@ #include "miscadmin.h" #include "storage/bufmgr.h" #include "storage/freespace.h" -#include "storage/procarray.h" #include "storage/lmgr.h" +#include "storage/procarray.h" #include "utils/builtins.h" PG_FUNCTION_INFO_V1(pgstattuple_approx); diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c index 57ed5f4b905..12f9dd35be8 100644 --- a/contrib/postgres_fdw/connection.c +++ b/contrib/postgres_fdw/connection.c @@ -12,21 +12,19 @@ */ #include "postgres.h" -#include "postgres_fdw.h" - #include "access/htup_details.h" #include "access/xact.h" #include "catalog/pg_user_mapping.h" #include "mb/pg_wchar.h" #include "miscadmin.h" #include "pgstat.h" +#include "postgres_fdw.h" #include "storage/latch.h" #include "utils/hsearch.h" #include "utils/inval.h" #include "utils/memutils.h" #include "utils/syscache.h" - /* * Connection cache hash table entry * diff --git a/contrib/postgres_fdw/deparse.c b/contrib/postgres_fdw/deparse.c index 431c34a4246..e803997be6c 100644 --- a/contrib/postgres_fdw/deparse.c +++ b/contrib/postgres_fdw/deparse.c @@ -33,8 +33,6 @@ */ #include "postgres.h" -#include "postgres_fdw.h" - #include "access/htup_details.h" #include "access/sysattr.h" #include "access/table.h" @@ -52,13 +50,13 @@ #include "optimizer/prep.h" #include "optimizer/tlist.h" #include "parser/parsetree.h" +#include "postgres_fdw.h" #include "utils/builtins.h" #include "utils/lsyscache.h" #include "utils/rel.h" #include "utils/syscache.h" #include "utils/typcache.h" - /* * Global context for foreign_expr_walker's search of an expression tree. */ diff --git a/contrib/postgres_fdw/option.c b/contrib/postgres_fdw/option.c index 7ea68c3ce3d..da175a626f2 100644 --- a/contrib/postgres_fdw/option.c +++ b/contrib/postgres_fdw/option.c @@ -12,18 +12,16 @@ */ #include "postgres.h" -#include "postgres_fdw.h" - #include "access/reloptions.h" #include "catalog/pg_foreign_server.h" #include "catalog/pg_foreign_table.h" #include "catalog/pg_user_mapping.h" #include "commands/defrem.h" #include "commands/extension.h" +#include "postgres_fdw.h" #include "utils/builtins.h" #include "utils/varlena.h" - /* * Describes the valid options for objects that this wrapper uses. */ diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c index 82d8140ba25..32366641a3e 100644 --- a/contrib/postgres_fdw/postgres_fdw.c +++ b/contrib/postgres_fdw/postgres_fdw.c @@ -12,8 +12,6 @@ */ #include "postgres.h" -#include "postgres_fdw.h" - #include "access/htup_details.h" #include "access/sysattr.h" #include "access/table.h" @@ -35,6 +33,7 @@ #include "optimizer/restrictinfo.h" #include "optimizer/tlist.h" #include "parser/parsetree.h" +#include "postgres_fdw.h" #include "utils/builtins.h" #include "utils/float.h" #include "utils/guc.h" diff --git a/contrib/postgres_fdw/shippable.c b/contrib/postgres_fdw/shippable.c index 2b55a40db36..14d6d092121 100644 --- a/contrib/postgres_fdw/shippable.c +++ b/contrib/postgres_fdw/shippable.c @@ -23,15 +23,13 @@ #include "postgres.h" -#include "postgres_fdw.h" - #include "access/transam.h" #include "catalog/dependency.h" +#include "postgres_fdw.h" #include "utils/hsearch.h" #include "utils/inval.h" #include "utils/syscache.h" - /* Hash table for caching the results of shippability lookups */ static HTAB *ShippableCacheHash = NULL; diff --git a/contrib/sepgsql/database.c b/contrib/sepgsql/database.c index 8edd3df643c..0190d381a90 100644 --- a/contrib/sepgsql/database.c +++ b/contrib/sepgsql/database.c @@ -15,14 +15,14 @@ #include "access/sysattr.h" #include "access/table.h" #include "catalog/dependency.h" -#include "catalog/pg_database.h" #include "catalog/indexing.h" +#include "catalog/pg_database.h" #include "commands/dbcommands.h" #include "commands/seclabel.h" +#include "sepgsql.h" #include "utils/builtins.h" #include "utils/fmgroids.h" #include "utils/snapmgr.h" -#include "sepgsql.h" /* * sepgsql_database_post_create diff --git a/contrib/sepgsql/dml.c b/contrib/sepgsql/dml.c index 2892346f800..14198799990 100644 --- a/contrib/sepgsql/dml.c +++ b/contrib/sepgsql/dml.c @@ -14,8 +14,8 @@ #include "access/sysattr.h" #include "access/tupdesc.h" #include "catalog/catalog.h" -#include "catalog/heap.h" #include "catalog/dependency.h" +#include "catalog/heap.h" #include "catalog/pg_attribute.h" #include "catalog/pg_class.h" #include "catalog/pg_inherits.h" @@ -23,11 +23,10 @@ #include "commands/tablecmds.h" #include "executor/executor.h" #include "nodes/bitmapset.h" +#include "sepgsql.h" #include "utils/lsyscache.h" #include "utils/syscache.h" -#include "sepgsql.h" - /* * fixup_whole_row_references * diff --git a/contrib/sepgsql/hooks.c b/contrib/sepgsql/hooks.c index ebfa441b47a..992c70e8a06 100644 --- a/contrib/sepgsql/hooks.c +++ b/contrib/sepgsql/hooks.c @@ -20,12 +20,11 @@ #include "executor/executor.h" #include "fmgr.h" #include "miscadmin.h" +#include "sepgsql.h" #include "tcop/utility.h" #include "utils/guc.h" #include "utils/queryenvironment.h" -#include "sepgsql.h" - PG_MODULE_MAGIC; /* diff --git a/contrib/sepgsql/label.c b/contrib/sepgsql/label.c index 63a2dd5cc1b..d2505f7f343 100644 --- a/contrib/sepgsql/label.c +++ b/contrib/sepgsql/label.c @@ -12,8 +12,8 @@ #include <selinux/label.h> -#include "access/htup_details.h" #include "access/genam.h" +#include "access/htup_details.h" #include "access/table.h" #include "access/xact.h" #include "catalog/catalog.h" @@ -29,6 +29,7 @@ #include "libpq/auth.h" #include "libpq/libpq-be.h" #include "miscadmin.h" +#include "sepgsql.h" #include "utils/builtins.h" #include "utils/fmgroids.h" #include "utils/guc.h" @@ -36,8 +37,6 @@ #include "utils/memutils.h" #include "utils/rel.h" -#include "sepgsql.h" - /* * Saved hook entries (if stacked) */ diff --git a/contrib/sepgsql/proc.c b/contrib/sepgsql/proc.c index aa12dbe2367..345a4c253d8 100644 --- a/contrib/sepgsql/proc.c +++ b/contrib/sepgsql/proc.c @@ -21,14 +21,13 @@ #include "catalog/pg_type.h" #include "commands/seclabel.h" #include "lib/stringinfo.h" +#include "sepgsql.h" #include "utils/builtins.h" #include "utils/fmgroids.h" #include "utils/lsyscache.h" #include "utils/snapmgr.h" #include "utils/syscache.h" -#include "sepgsql.h" - /* * sepgsql_proc_post_create * diff --git a/contrib/sepgsql/relation.c b/contrib/sepgsql/relation.c index 061527559c1..714cffed973 100644 --- a/contrib/sepgsql/relation.c +++ b/contrib/sepgsql/relation.c @@ -14,23 +14,22 @@ #include "access/htup_details.h" #include "access/sysattr.h" #include "access/table.h" -#include "catalog/indexing.h" #include "catalog/dependency.h" +#include "catalog/indexing.h" #include "catalog/pg_attribute.h" #include "catalog/pg_class.h" #include "catalog/pg_namespace.h" #include "commands/seclabel.h" #include "lib/stringinfo.h" +#include "sepgsql.h" #include "utils/builtins.h" -#include "utils/fmgroids.h" #include "utils/catcache.h" +#include "utils/fmgroids.h" #include "utils/lsyscache.h" #include "utils/rel.h" #include "utils/snapmgr.h" #include "utils/syscache.h" -#include "sepgsql.h" - static void sepgsql_index_modify(Oid indexOid); /* diff --git a/contrib/sepgsql/schema.c b/contrib/sepgsql/schema.c index 4c4a90f9781..92ef156ff57 100644 --- a/contrib/sepgsql/schema.c +++ b/contrib/sepgsql/schema.c @@ -21,13 +21,12 @@ #include "commands/seclabel.h" #include "lib/stringinfo.h" #include "miscadmin.h" +#include "sepgsql.h" #include "utils/builtins.h" #include "utils/fmgroids.h" #include "utils/lsyscache.h" #include "utils/snapmgr.h" -#include "sepgsql.h" - /* * sepgsql_schema_post_create * diff --git a/contrib/sepgsql/uavc.c b/contrib/sepgsql/uavc.c index 60fcf996539..8ce0bc631b7 100644 --- a/contrib/sepgsql/uavc.c +++ b/contrib/sepgsql/uavc.c @@ -14,13 +14,12 @@ #include "catalog/pg_proc.h" #include "commands/seclabel.h" +#include "sepgsql.h" #include "storage/ipc.h" #include "utils/guc.h" #include "utils/hashutils.h" #include "utils/memutils.h" -#include "sepgsql.h" - /* * avc_cache * diff --git a/contrib/spi/moddatetime.c b/contrib/spi/moddatetime.c index 70476f77c2f..3eb7004de97 100644 --- a/contrib/spi/moddatetime.c +++ b/contrib/spi/moddatetime.c @@ -17,8 +17,8 @@ OH, me, I'm Terry Mackintosh <terry@terrym.com> #include "access/htup_details.h" #include "catalog/pg_type.h" -#include "executor/spi.h" #include "commands/trigger.h" +#include "executor/spi.h" #include "utils/builtins.h" #include "utils/rel.h" diff --git a/contrib/tablefunc/tablefunc.c b/contrib/tablefunc/tablefunc.c index e31be80828e..256d52fc629 100644 --- a/contrib/tablefunc/tablefunc.c +++ b/contrib/tablefunc/tablefunc.c @@ -40,9 +40,8 @@ #include "funcapi.h" #include "lib/stringinfo.h" #include "miscadmin.h" -#include "utils/builtins.h" - #include "tablefunc.h" +#include "utils/builtins.h" PG_MODULE_MAGIC; diff --git a/contrib/tcn/tcn.c b/contrib/tcn/tcn.c index 5355a64c5e6..45687687b0c 100644 --- a/contrib/tcn/tcn.c +++ b/contrib/tcn/tcn.c @@ -16,9 +16,9 @@ #include "postgres.h" #include "access/htup_details.h" -#include "executor/spi.h" #include "commands/async.h" #include "commands/trigger.h" +#include "executor/spi.h" #include "lib/stringinfo.h" #include "utils/rel.h" #include "utils/syscache.h" diff --git a/contrib/vacuumlo/vacuumlo.c b/contrib/vacuumlo/vacuumlo.c index 533e2ce33c5..55b42e3565e 100644 --- a/contrib/vacuumlo/vacuumlo.c +++ b/contrib/vacuumlo/vacuumlo.c @@ -22,12 +22,11 @@ #endif #include "catalog/pg_class_d.h" - #include "common/logging.h" #include "fe_utils/connect.h" +#include "getopt_long.h" #include "libpq-fe.h" #include "pg_getopt.h" -#include "getopt_long.h" #define BUFSIZE 1024 |