Get rid of ejabberd.hrl header

The header consisted of too many unrelated stuff and macros misuse.
Some stuff is moved into scram.hrl and type_compat.hrl.
All macros have been replaced with the corresponding function calls.

TODO: probably type_compat.hrl is not even needed anymore since
we support only Erlang >= OTP 17.5

1 files changed, 6 insertions, 6 deletions

diff --git a/src/nodetree_dag.erl b/src/nodetree_dag.erl
index bb51aa6d2..93f414f31 100644
--- a/src/nodetree_dag.erl
+++ b/src/nodetree_dag.erl
@@ -69,13 +69,13 @@ create_node(Key, Node, Type, Owner, Options, Parents) ->
 		Other -> Other
 	    end;
 	_ ->
-	    {error, xmpp:err_conflict(<<"Node already exists">>, ?MYLANG)}
+	    {error, xmpp:err_conflict(<<"Node already exists">>, ejabberd_config:get_mylang())}
     end.
 
 delete_node(Key, Node) ->
     case find_node(Key, Node) of
 	false ->
-	    {error, xmpp:err_item_not_found(<<"Node not found">>, ?MYLANG)};
+	    {error, xmpp:err_item_not_found(<<"Node not found">>, ejabberd_config:get_mylang())};
 	Record ->
 	    lists:foreach(fun (#pubsub_node{options = Opts} = Child) ->
 			NewOpts = remove_config_parent(Node, Opts),
@@ -99,7 +99,7 @@ get_node(Host, Node, _From) ->
 
 get_node(Host, Node) ->
     case find_node(Host, Node) of
-	false -> {error, xmpp:err_item_not_found(<<"Node not found">>, ?MYLANG)};
+	false -> {error, xmpp:err_item_not_found(<<"Node not found">>, ejabberd_config:get_mylang())};
 	Record -> Record
     end.
 
@@ -115,7 +115,7 @@ get_nodes(Key) ->
 get_parentnodes(Host, Node, _From) ->
     case find_node(Host, Node) of
 	false ->
-	    {error, xmpp:err_item_not_found(<<"Node not found">>, ?MYLANG)};
+	    {error, xmpp:err_item_not_found(<<"Node not found">>, ejabberd_config:get_mylang())};
 	#pubsub_node{parents = Parents} ->
 	    Q = qlc:q([N
 			|| #pubsub_node{nodeid = {NHost, NNode}} = N
@@ -139,7 +139,7 @@ get_subnodes(Host, <<>>) ->
     get_subnodes_helper(Host, <<>>);
 get_subnodes(Host, Node) ->
     case find_node(Host, Node) of
-	false -> {error, xmpp:err_item_not_found(<<"Node not found">>, ?MYLANG)};
+	false -> {error, xmpp:err_item_not_found(<<"Node not found">>, ejabberd_config:get_mylang())};
 	_ -> get_subnodes_helper(Host, Node)
     end.
 
@@ -226,7 +226,7 @@ validate_parentage(Key, Owners, [<<>> | T]) ->
 validate_parentage(Key, Owners, [ParentID | T]) ->
     case find_node(Key, ParentID) of
 	false ->
-	    {error, xmpp:err_item_not_found(<<"Node not found">>, ?MYLANG)};
+	    {error, xmpp:err_item_not_found(<<"Node not found">>, ejabberd_config:get_mylang())};
 	#pubsub_node{owners = POwners, options = POptions} ->
 	    NodeType = find_opt(node_type, ?DEFAULT_NODETYPE, POptions),
 	    MutualOwners = [O || O <- Owners, PO <- POwners, O == PO],