hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-2205 Combine maxscale/server.h with maxscale/server.hh

Browse Source 
The server-struct is still used in several .h-files.
This commit is contained in:
Esa Korhonen
2018-12-03 16:38:28 +02:00
parent 756593a718
commit d9ae298102
29 changed files with 526 additions and 551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/routing/avrorouter/avro.cc
View File

@ -38,7 +38,7 @@
#include <maxscale/protocol/mysql.h>
#include <maxscale/random.h>
#include <maxscale/router.hh>
#include <maxscale/server.h>
#include <maxscale/server.hh>
#include <maxscale/service.hh>
#include <maxscale/utils.hh>
#include <maxscale/pcre2.h>

2
server/modules/routing/avrorouter/avro_client.cc
View File

@ -25,7 +25,7 @@
#include <fstream>
#include <sstream>
#include <maxscale/service.hh>
#include <maxscale/server.h>
#include <maxscale/server.hh>
#include <maxscale/router.hh>
#include <maxbase/atomic.h>
#include <maxscale/dcb.h>

2
server/modules/routing/avrorouter/avro_main.cc
View File

@ -34,7 +34,7 @@
#include <maxscale/protocol/mysql.h>
#include <maxscale/random.h>
#include <maxscale/router.hh>
#include <maxscale/server.h>
#include <maxscale/server.hh>
#include <maxscale/service.hh>
#include <maxscale/utils.h>
#include <maxscale/routingworker.h>

2
server/modules/routing/binlogrouter/blr.cc
View File

@ -45,7 +45,7 @@
#include <maxscale/protocol/mysql.h>
#include <maxscale/router.hh>
#include <maxscale/secrets.h>
#include <maxscale/server.h>
#include <maxscale/server.hh>
#include <maxscale/service.hh>
#include <maxscale/users.h>
#include <maxscale/utils.h>

2
server/modules/routing/binlogrouter/blr_cache.cc
View File

@ -30,7 +30,7 @@
#include <stdlib.h>
#include <string.h>
#include <maxscale/service.hh>
#include <maxscale/server.h>
#include <maxscale/server.hh>
#include <maxscale/router.hh>
#include <maxbase/atomic.h>
#include <maxscale/dcb.h>

2
server/modules/routing/binlogrouter/blr_file.cc
View File

@ -38,7 +38,7 @@
#include <maxscale/paths.h>
#include <maxscale/router.hh>
#include <maxscale/secrets.h>
#include <maxscale/server.h>
#include <maxscale/server.hh>
#include <maxscale/service.hh>
#include <maxscale/utils.h>

2
server/modules/routing/binlogrouter/blr_master.cc
View File

@ -50,7 +50,7 @@
#include <maxscale/router.hh>
#include <maxscale/routingworker.h>
#include <maxbase/worker.hh>
#include <maxscale/server.h>
#include <maxscale/server.hh>
#include <maxscale/service.hh>
#include <maxscale/session.h>
#include <maxscale/utils.h>

2
server/modules/routing/binlogrouter/blr_slave.cc
View File

@ -43,7 +43,7 @@
#include <maxscale/maxscale.h>
#include <maxscale/poll.h>
#include <maxscale/router.hh>
#include <maxscale/server.h>
#include <maxscale/server.hh>
#include <maxscale/service.hh>
#include <maxscale/utils.h>
#include <maxscale/version.h>

2
server/modules/routing/binlogrouter/test/testbinlog.cc
View File

@ -29,7 +29,7 @@
#include <string.h>
#include <ctype.h>
#include <time.h>
#include <maxscale/server.h>
#include <maxscale/server.hh>
#include <maxscale/router.hh>
#include <maxbase/atomic.h>
#include <maxscale/dcb.h>

2
server/modules/routing/maxinfo/maxinfo.cc
View File

@ -35,7 +35,7 @@
#include <maxscale/alloc.h>
#include <maxscale/service.hh>
#include <maxscale/server.h>
#include <maxscale/server.hh>
#include <maxscale/router.hh>
#include <maxscale/modinfo.h>
#include <maxscale/modutil.hh>

2
server/modules/routing/readwritesplit/rwsplit_route_stmt.cc
View File

@ -24,7 +24,7 @@
#include <maxscale/modutil.hh>
#include <maxscale/modutil.hh>
#include <maxscale/router.hh>
#include <maxscale/server.h>
#include <maxscale/server.hh>
#include <maxscale/session_command.hh>
#include <maxscale/utils.hh>