From 1cc5fee5904832da6564f12c858423fd5bd1b2b6 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Tue, 22 Apr 2014 17:14:28 -0700 Subject: Make travis happy --- src/admin/ladmin.cpp | 5 +++-- src/admin/ladmin.hpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src/admin') diff --git a/src/admin/ladmin.cpp b/src/admin/ladmin.cpp index a4c2464..c078104 100644 --- a/src/admin/ladmin.cpp +++ b/src/admin/ladmin.cpp @@ -260,6 +260,7 @@ TString parameters; // needs to be global since it's passed to the parse functio // really should be added to session data static AccountId list_first, list_last; +static int list_type, list_count; // parameter to display a list of accounts static int already_exit_function = 0; // sometimes, the exit function is called twice... so, don't log twice the message @@ -286,7 +287,7 @@ void ladmin_log(XString line) log_with_timestamp(logfp, line); } -static +static __attribute__((noreturn)) void delete_fromlogin(Session *) { { @@ -2770,7 +2771,7 @@ int Connect_login_server(void) Iprintf("Attempt to connect to login-server...\n"_fmt); LADMIN_LOG("Attempt to connect to login-server...\n"_fmt); - login_session = make_connection(login_ip, login_port, SessionParsers{func_parse: parse_fromlogin, func_delete: delete_fromlogin}); + login_session = make_connection(login_ip, login_port, SessionParsers{.func_parse= parse_fromlogin, .func_delete= delete_fromlogin}); if (!login_session) return 0; diff --git a/src/admin/ladmin.hpp b/src/admin/ladmin.hpp index 034f644..06580eb 100644 --- a/src/admin/ladmin.hpp +++ b/src/admin/ladmin.hpp @@ -19,6 +19,6 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -# include "../sanity.hpp" +# include "fwd.hpp" #endif // TMWA_ADMIN_LADMIN_HPP -- cgit v1.2.3-60-g2f50