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

The server-struct is still used in several .h-files.

server/core/dcb.cc

@@ -47,7 +47,7 @@
 #include <maxscale/log.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/routingworker.hh>

server/core/gateway.cc

@@ -56,7 +56,7 @@
 #include <maxscale/mysql_utils.hh>
 #include <maxscale/paths.h>
 #include <maxscale/query_classifier.h>
-#include <maxscale/server.h>
+#include <maxscale/server.hh>
 #include <maxscale/sqlite3.h>
 #include <maxscale/session.h>
 #include <maxscale/utils.h>

server/core/internal/resource.hh

@@ -19,7 +19,7 @@
 #include <string>
 #include <deque>
 
-#include <maxscale/server.h>
+#include <maxscale/server.hh>
 #include <maxscale/http.hh>
 
 #include "httprequest.hh"

server/core/internal/server.hh

@@ -21,7 +21,7 @@
 #include <mutex>
 
 #include <maxbase/average.hh>
-#include <maxscale/server.h>
+#include <maxscale/server.hh>
 #include <maxscale/resultset.hh>
 #include <maxscale/routingworker.hh>
 

server/core/poll.cc

@@ -32,7 +32,7 @@
 #include <maxbase/atomic.h>
 #include <maxscale/config.hh>
 #include <maxscale/clock.h>
-#include <maxscale/server.h>
+#include <maxscale/server.hh>
 #include <maxscale/statistics.hh>
 #include <maxscale/routingworker.hh>
 

server/core/service.cc

@@ -47,7 +47,7 @@
 #include <maxscale/protocol.h>
 #include <maxscale/resultset.hh>
 #include <maxscale/router.hh>
-#include <maxscale/server.h>
+#include <maxscale/server.hh>
 #include <maxscale/session.h>
 #include <maxscale/users.h>
 #include <maxscale/utils.h>

server/core/test/test_server.cc

@@ -34,7 +34,7 @@
 #include <string.h>
 
 #include <maxscale/alloc.h>
-#include <maxscale/server.h>
+#include <maxscale/server.hh>
 #include <maxscale/log.h>
 #include <maxscale/paths.h>
 #include <maxscale/config.hh>