From 610cf23c7cbafd8d57536adfb6977f76508b0923 Mon Sep 17 00:00:00 2001 From: Dmitry Simonenko Date: Fri, 15 Sep 2017 15:58:29 +0300 Subject: [PATCH] odissey: reorder instance.h inclusion --- sources/auth.c | 2 +- sources/backend.c | 2 +- sources/cancel.c | 2 +- sources/client_pool.c | 1 - sources/console.c | 2 +- sources/frontend.c | 2 +- sources/instance.c | 2 +- sources/periodic.c | 2 +- sources/pooler.c | 2 +- sources/relay.c | 2 +- sources/relay_pool.c | 2 +- sources/reset.c | 2 +- sources/router.c | 2 +- sources/tls.c | 2 +- 14 files changed, 13 insertions(+), 14 deletions(-) diff --git a/sources/auth.c b/sources/auth.c index 68f563c6..4f8d27b5 100644 --- a/sources/auth.c +++ b/sources/auth.c @@ -31,7 +31,6 @@ #include "sources/config.h" #include "sources/msg.h" #include "sources/system.h" -#include "sources/instance.h" #include "sources/server.h" #include "sources/server_pool.h" #include "sources/client.h" @@ -40,6 +39,7 @@ #include "sources/route.h" #include "sources/route_pool.h" #include "sources/io.h" +#include "sources/instance.h" #include "sources/router.h" #include "sources/pooler.h" #include "sources/relay.h" diff --git a/sources/backend.c b/sources/backend.c index 9c44974d..a3ec8605 100644 --- a/sources/backend.c +++ b/sources/backend.c @@ -31,7 +31,6 @@ #include "sources/config.h" #include "sources/msg.h" #include "sources/system.h" -#include "sources/instance.h" #include "sources/server.h" #include "sources/server_pool.h" #include "sources/client.h" @@ -40,6 +39,7 @@ #include "sources/route.h" #include "sources/route_pool.h" #include "sources/io.h" +#include "sources/instance.h" #include "sources/router.h" #include "sources/pooler.h" #include "sources/relay.h" diff --git a/sources/cancel.c b/sources/cancel.c index 9b6105eb..607c6bee 100644 --- a/sources/cancel.c +++ b/sources/cancel.c @@ -31,7 +31,6 @@ #include "sources/config.h" #include "sources/msg.h" #include "sources/system.h" -#include "sources/instance.h" #include "sources/server.h" #include "sources/server_pool.h" #include "sources/client.h" @@ -40,6 +39,7 @@ #include "sources/route.h" #include "sources/route_pool.h" #include "sources/io.h" +#include "sources/instance.h" #include "sources/router.h" #include "sources/pooler.h" #include "sources/relay.h" diff --git a/sources/client_pool.c b/sources/client_pool.c index af1a3e25..1df76d20 100644 --- a/sources/client_pool.c +++ b/sources/client_pool.c @@ -31,7 +31,6 @@ #include "sources/config.h" #include "sources/msg.h" #include "sources/system.h" -#include "sources/instance.h" #include "sources/server.h" #include "sources/server_pool.h" #include "sources/client.h" diff --git a/sources/console.c b/sources/console.c index 147b1039..2512ce5c 100644 --- a/sources/console.c +++ b/sources/console.c @@ -32,7 +32,6 @@ #include "sources/config.h" #include "sources/msg.h" #include "sources/system.h" -#include "sources/instance.h" #include "sources/server.h" #include "sources/server_pool.h" #include "sources/client.h" @@ -41,6 +40,7 @@ #include "sources/route.h" #include "sources/route_pool.h" #include "sources/io.h" +#include "sources/instance.h" #include "sources/router.h" #include "sources/pooler.h" #include "sources/relay.h" diff --git a/sources/frontend.c b/sources/frontend.c index 44f3bc4a..2e1de55a 100644 --- a/sources/frontend.c +++ b/sources/frontend.c @@ -31,7 +31,6 @@ #include "sources/config.h" #include "sources/msg.h" #include "sources/system.h" -#include "sources/instance.h" #include "sources/server.h" #include "sources/server_pool.h" #include "sources/client.h" @@ -40,6 +39,7 @@ #include "sources/route.h" #include "sources/route_pool.h" #include "sources/io.h" +#include "sources/instance.h" #include "sources/router.h" #include "sources/pooler.h" #include "sources/relay.h" diff --git a/sources/instance.c b/sources/instance.c index 0a44d5ec..31dac8ea 100644 --- a/sources/instance.c +++ b/sources/instance.c @@ -31,7 +31,6 @@ #include "sources/config.h" #include "sources/msg.h" #include "sources/system.h" -#include "sources/instance.h" #include "sources/server.h" #include "sources/server_pool.h" #include "sources/client.h" @@ -40,6 +39,7 @@ #include "sources/route.h" #include "sources/route_pool.h" #include "sources/io.h" +#include "sources/instance.h" #include "sources/router.h" #include "sources/console.h" #include "sources/pooler.h" diff --git a/sources/periodic.c b/sources/periodic.c index 9f032fd3..d8e59402 100644 --- a/sources/periodic.c +++ b/sources/periodic.c @@ -31,7 +31,6 @@ #include "sources/config.h" #include "sources/msg.h" #include "sources/system.h" -#include "sources/instance.h" #include "sources/server.h" #include "sources/server_pool.h" #include "sources/client.h" @@ -40,6 +39,7 @@ #include "sources/route.h" #include "sources/route_pool.h" #include "sources/io.h" +#include "sources/instance.h" #include "sources/router.h" #include "sources/pooler.h" #include "sources/relay.h" diff --git a/sources/pooler.c b/sources/pooler.c index 81f34661..4c7d3dd0 100644 --- a/sources/pooler.c +++ b/sources/pooler.c @@ -33,7 +33,6 @@ #include "sources/config.h" #include "sources/msg.h" #include "sources/system.h" -#include "sources/instance.h" #include "sources/server.h" #include "sources/server_pool.h" #include "sources/client.h" @@ -42,6 +41,7 @@ #include "sources/route.h" #include "sources/route_pool.h" #include "sources/io.h" +#include "sources/instance.h" #include "sources/router.h" #include "sources/console.h" #include "sources/relay.h" diff --git a/sources/relay.c b/sources/relay.c index 16054989..988fb395 100644 --- a/sources/relay.c +++ b/sources/relay.c @@ -31,7 +31,6 @@ #include "sources/config.h" #include "sources/msg.h" #include "sources/system.h" -#include "sources/instance.h" #include "sources/server.h" #include "sources/server_pool.h" #include "sources/client.h" @@ -39,6 +38,7 @@ #include "sources/route_id.h" #include "sources/route.h" #include "sources/route_pool.h" +#include "sources/instance.h" #include "sources/router.h" #include "sources/pooler.h" #include "sources/relay.h" diff --git a/sources/relay_pool.c b/sources/relay_pool.c index 88003d61..cba8ebb3 100644 --- a/sources/relay_pool.c +++ b/sources/relay_pool.c @@ -31,7 +31,6 @@ #include "sources/config.h" #include "sources/msg.h" #include "sources/system.h" -#include "sources/instance.h" #include "sources/server.h" #include "sources/server_pool.h" #include "sources/client.h" @@ -39,6 +38,7 @@ #include "sources/route_id.h" #include "sources/route.h" #include "sources/route_pool.h" +#include "sources/instance.h" #include "sources/router.h" #include "sources/pooler.h" #include "sources/relay.h" diff --git a/sources/reset.c b/sources/reset.c index 87bf77f3..d9c1b651 100644 --- a/sources/reset.c +++ b/sources/reset.c @@ -31,7 +31,6 @@ #include "sources/config.h" #include "sources/msg.h" #include "sources/system.h" -#include "sources/instance.h" #include "sources/server.h" #include "sources/server_pool.h" #include "sources/client.h" @@ -40,6 +39,7 @@ #include "sources/route.h" #include "sources/route_pool.h" #include "sources/io.h" +#include "sources/instance.h" #include "sources/router.h" #include "sources/pooler.h" #include "sources/relay.h" diff --git a/sources/router.c b/sources/router.c index 6fef62a0..e1e87791 100644 --- a/sources/router.c +++ b/sources/router.c @@ -31,7 +31,6 @@ #include "sources/config.h" #include "sources/msg.h" #include "sources/system.h" -#include "sources/instance.h" #include "sources/server.h" #include "sources/server_pool.h" #include "sources/client.h" @@ -40,6 +39,7 @@ #include "sources/route.h" #include "sources/route_pool.h" #include "sources/io.h" +#include "sources/instance.h" #include "sources/router.h" #include "sources/pooler.h" #include "sources/relay.h" diff --git a/sources/tls.c b/sources/tls.c index 0152a90f..293a5ea5 100644 --- a/sources/tls.c +++ b/sources/tls.c @@ -31,7 +31,6 @@ #include "sources/config.h" #include "sources/msg.h" #include "sources/system.h" -#include "sources/instance.h" #include "sources/server.h" #include "sources/server_pool.h" #include "sources/client.h" @@ -40,6 +39,7 @@ #include "sources/route.h" #include "sources/route_pool.h" #include "sources/io.h" +#include "sources/instance.h" #include "sources/router.h" #include "sources/pooler.h" #include "sources/relay.h"