Move modules.h to core/maxscale

Also remove some unnecessary includes + cleanup
2017-01-19 14:20:19 +02:00
parent 53c5b475ad
commit eff34b91fb
22 changed files with 29 additions and 30 deletions
--- a/server/modules/routing/cli/cli.c
+++ b/server/modules/routing/cli/cli.c
@ -33,7 +33,6 @@
 #include <maxscale/service.h>
 #include <maxscale/session.h>
 #include <maxscale/router.h>
-#include <maxscale/modules.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/atomic.h>
 #include <maxscale/spinlock.h>
--- a/server/modules/routing/debugcli/debugcli.c
+++ b/server/modules/routing/debugcli/debugcli.c
@ -32,7 +32,6 @@
 #include <maxscale/service.h>
 #include <maxscale/session.h>
 #include <maxscale/router.h>
-#include <maxscale/modules.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/atomic.h>
 #include <maxscale/spinlock.h>
--- a/server/modules/routing/debugcli/debugcmd.c
+++ b/server/modules/routing/debugcli/debugcmd.c
@ -58,7 +58,6 @@
 #include <maxscale/service.h>
 #include <maxscale/router.h>
 #include <maxscale/filter.h>
-#include <maxscale/modules.h>
 #include <maxscale/modulecmd.h>
 #include <maxscale/atomic.h>
 #include <maxscale/server.h>
@ -81,6 +80,8 @@

 #include "../../../core/maxscale/session.h"

+#include "../../../core/maxscale/modules.h"
+
 #define MAXARGS 12

 #define ARG_TYPE_NONE           0
--- a/server/modules/routing/maxinfo/maxinfo.c
+++ b/server/modules/routing/maxinfo/maxinfo.c
@ -36,7 +36,6 @@
 #include <maxscale/service.h>
 #include <maxscale/server.h>
 #include <maxscale/router.h>
-#include <maxscale/modules.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
 #include <maxscale/monitor.h>
@ -52,6 +51,7 @@
 #include <maxscale/secrets.h>
 #include <maxscale/users.h>

+#include "../../../core/maxscale/modules.h"
 #include "../../../core/maxscale/session.h"
 #include "../../../core/maxscale/monitor.h"

--- a/server/modules/routing/maxinfo/maxinfo_error.c
+++ b/server/modules/routing/maxinfo/maxinfo_error.c
@ -32,7 +32,6 @@
 #include <maxscale/service.h>
 #include <maxscale/session.h>
 #include <maxscale/router.h>
-#include <maxscale/modules.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
 #include <maxscale/atomic.h>
--- a/server/modules/routing/maxinfo/maxinfo_exec.c
+++ b/server/modules/routing/maxinfo/maxinfo_exec.c
@ -29,23 +29,24 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include <maxscale/alloc.h>
-#include <maxscale/service.h>
-#include <maxscale/router.h>
-#include <maxscale/modules.h>
-#include <maxscale/version.h>
+#include <maxscale/atomic.h>
+#include <maxscale/config.h>
+#include <maxscale/dcb.h>
+#include <maxscale/log_manager.h>
+#include <maxscale/maxscale.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
-#include <maxscale/atomic.h>
-#include <maxscale/spinlock.h>
-#include <maxscale/dcb.h>
-#include <maxscale/maxscale.h>
 #include <maxscale/poll.h>
-#include <maxscale/log_manager.h>
 #include <maxscale/resultset.h>
-#include <maxscale/config.h>
+#include <maxscale/router.h>
+#include <maxscale/service.h>
+#include <maxscale/spinlock.h>
+#include <maxscale/version.h>

 #include "../../../core/maxscale/session.h"
+#include "../../../core/maxscale/modules.h"
 #include "../../../core/maxscale/monitor.h"

 static void exec_show(DCB *dcb, MAXINFO_TREE *tree);
--- a/server/modules/routing/maxinfo/maxinfo_parse.c
+++ b/server/modules/routing/maxinfo/maxinfo_parse.c
@ -34,7 +34,6 @@
 #include <maxscale/service.h>
 #include <maxscale/session.h>
 #include <maxscale/router.h>
-#include <maxscale/modules.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
 #include <maxscale/atomic.h>