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

The server-struct is still used in several .h-files.
2018-12-03 16:38:28 +02:00
parent 756593a718
commit d9ae298102
29 changed files with 526 additions and 551 deletions
--- a/server/modules/authenticator/GSSAPI/GSSAPIBackendAuth/gssapi_backend_auth.cc
+++ b/server/modules/authenticator/GSSAPI/GSSAPIBackendAuth/gssapi_backend_auth.cc
@ -18,7 +18,7 @@
 #include <maxscale/dcb.h>
 #include <maxscale/log.h>
 #include <maxscale/protocol/mysql.h>
-#include <maxscale/server.h>
+#include <maxscale/server.hh>

 #include "../gssapi_auth.h"

--- a/server/modules/authenticator/MySQLBackendAuth/mysql_backend_auth.cc
+++ b/server/modules/authenticator/MySQLBackendAuth/mysql_backend_auth.cc
@ -27,7 +27,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/authenticator.h>
 #include <maxscale/protocol/mysql.h>
-#include <maxscale/server.h>
+#include <maxscale/server.hh>
 #include <maxscale/utils.h>

 /** Authentication states */
--- a/server/modules/authenticator/PAM/PAMBackendAuth/pam_backend_auth.cc
+++ b/server/modules/authenticator/PAM/PAMBackendAuth/pam_backend_auth.cc
@ -15,7 +15,7 @@

 #include <maxscale/authenticator.h>
 #include <maxscale/log.h>
-#include <maxscale/server.h>
+#include <maxscale/server.hh>
 #include "pam_backend_session.hh"
 #include "../pam_auth_common.hh"

--- a/server/modules/authenticator/PAM/PAMBackendAuth/pam_backend_session.cc
+++ b/server/modules/authenticator/PAM/PAMBackendAuth/pam_backend_session.cc
@ -12,7 +12,7 @@
 */

 #include "pam_backend_session.hh"
-#include <maxscale/server.h>
+#include <maxscale/server.hh>

 namespace
 {