Reorder #includes to follow project style.

diff --git a/contrib/pg_rewind/copy_fetch.c b/contrib/pg_rewind/copy_fetch.c
index 4695d0ecac1e87bf0729db4d2b4b611d27ac9c66..6b6f8108269d57ed36f5f62aa22bffd9771877d7 100644 (file)
--- a/contrib/pg_rewind/copy_fetch.c
+++ b/contrib/pg_rewind/copy_fetch.c
@@ -9,8 +9,6 @@
  */
 #include "postgres_fe.h"
 
-#include "catalog/catalog.h"
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
@@ -23,6 +21,8 @@
 #include "filemap.h"
 #include "datapagemap.h"
 
+#include "catalog/catalog.h"
+
 static void recurse_dir(const char *datadir, const char *path,
                        process_file_callback_t callback);
 

diff --git a/contrib/pg_rewind/filemap.c b/contrib/pg_rewind/filemap.c
index 41d3c9ef925ea1f582059ab7c75f76bbdbf85c24..aca3f9349b9188b5c9b466118633b5aa33772e06 100644 (file)
--- a/contrib/pg_rewind/filemap.c
+++ b/contrib/pg_rewind/filemap.c
@@ -17,6 +17,7 @@
 #include "datapagemap.h"
 #include "filemap.h"
 #include "pg_rewind.h"
+
 #include "catalog/pg_tablespace.h"
 #include "storage/fd.h"
 

diff --git a/contrib/pg_rewind/libpq_fetch.c b/contrib/pg_rewind/libpq_fetch.c
index 5172acd3bf39963516d409b20ef8d3f5e15b2a12..b5f5314a4aa7bbb5f823e836144a90f44e47689c 100644 (file)
--- a/contrib/pg_rewind/libpq_fetch.c
+++ b/contrib/pg_rewind/libpq_fetch.c
@@ -9,9 +9,6 @@
  */
 #include "postgres_fe.h"
 
-#include "catalog/catalog.h"
-#include "catalog/pg_type.h"
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
@@ -22,13 +19,15 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "libpq-fe.h"
-
 #include "pg_rewind.h"
 #include "fetch.h"
 #include "filemap.h"
 #include "datapagemap.h"
 
+#include "libpq-fe.h"
+#include "catalog/catalog.h"
+#include "catalog/pg_type.h"
+
 static PGconn *conn = NULL;
 
 #define CHUNKSIZE 1000000

diff --git a/contrib/pg_rewind/parsexlog.c b/contrib/pg_rewind/parsexlog.c
index be5646b5356f82e92ad219f313eac9ee09eb24c1..f661245bed5ffe5c2a664bc667ebb7daa7891a62 100644 (file)
--- a/contrib/pg_rewind/parsexlog.c
+++ b/contrib/pg_rewind/parsexlog.c
@@ -14,11 +14,11 @@
 #undef FRONTEND
 #include "postgres.h"
 
+#include <unistd.h>
+
 #include "pg_rewind.h"
 #include "filemap.h"
 
-#include <unistd.h>
-
 #include "access/rmgr.h"
 #include "access/xlog_internal.h"
 #include "access/xlogreader.h"

diff --git a/contrib/pg_rewind/pg_rewind.c b/contrib/pg_rewind/pg_rewind.c
index 853cefb985b101fa8991ad48d25543fda9522ef9..6accfa8343b71e4e4151a0fc349beb8a0264d1b7 100644 (file)
--- a/contrib/pg_rewind/pg_rewind.c
+++ b/contrib/pg_rewind/pg_rewind.c
@@ -9,6 +9,11 @@
  */
 #include "postgres_fe.h"
 
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <time.h>
+#include <unistd.h>
+
 #include "pg_rewind.h"
 #include "fetch.h"
 #include "filemap.h"
@@ -17,14 +22,8 @@
 #include "access/xlog_internal.h"
 #include "catalog/catversion.h"
 #include "catalog/pg_control.h"
-#include "storage/bufpage.h"
-
 #include "getopt_long.h"
-
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <time.h>
-#include <unistd.h>
+#include "storage/bufpage.h"
 
 static void usage(const char *progname);