Include session record from header file instead of duplicating it

diff --git a/include/ejabberd_sm.hrl b/include/ejabberd_sm.hrl
index 756f4b8884e6ec2875d1d087f0f91c3e7fb92685..bae60ccd374a98544cb26a3aaea897ca231ce34b 100644 (file)
--- a/include/ejabberd_sm.hrl
+++ b/include/ejabberd_sm.hrl
@@ -1,3 +1,6 @@
+-ifndef(EJABBERD_SM_HRL).
+-define(EJABBERD_SM_HRL, true).
+
 -record(session, {sid, usr, us, priority, info}).
 -record(session_counter, {vhost, count}).
 -type sid() :: {erlang:timestamp(), pid()}.
@@ -5,3 +8,5 @@
 -type info() :: [{conn, atom()} | {ip, ip()} | {node, atom()}
                  | {oor, boolean()} | {auth_module, atom()}].
 -type prio() :: undefined | integer().
+
+-endif.

diff --git a/src/mod_admin_extra.erl b/src/mod_admin_extra.erl
index 8eae45b6daa31ae31581957adc8794a4d790cb06..bc49bae47b472c5cc65310279439c667d56ad8c5 100644 (file)
--- a/src/mod_admin_extra.erl
+++ b/src/mod_admin_extra.erl
@@ -89,15 +89,13 @@
         stats/1, stats/2
        ]).
 
+
 -include("ejabberd.hrl").
 -include("ejabberd_commands.hrl").
 -include("mod_roster.hrl").
+-include("ejabberd_sm.hrl").
 -include("jlib.hrl").
 
-%% Copied from ejabberd_sm.erl
--record(session, {sid, usr, us, priority, info}).
-
-
 %%%
 %%% gen_mod
 %%%