Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-14 22:00:16 +02:00
Code Releases Activity

Fix PubSub NG compilation

Browse Source
This commit is contained in:
Evgeniy Khramtsov 2013-05-11 20:53:51 +10:00
parent bec499a4a1
commit 170874e115
5 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mod_pubsub_ng/exmpp_pubsub.erl
View File

@ -273,15 +273,15 @@
Subscription_Options :: []} Subscription_Options :: []}
). ).
-type(subscription() %% -type(subscription()
:: {Subscription_State :: exmpp_pubsub:subscription_state(), %% :: {Subscription_State :: exmpp_pubsub:subscription_state(),
SubId :: exmpp_pubsub:subId(), %% SubId :: exmpp_pubsub:subId(),
Resource :: undefined | xmpp_jid:resource_jid() | {'caps', xmpp_jid:resource_jid()}, %% Resource :: undefined | xmpp_jid:resource_jid() | {'caps', xmpp_jid:resource_jid()},
Subscription_Options :: [] | pubsub_options:options_subscription()} %% Subscription_Options :: [] | pubsub_options:options_subscription()}
%% :: exmpp_pubsub:subscription_subscribed() %% %% :: exmpp_pubsub:subscription_subscribed()
%% | exmpp_pubsub:subscription_pending() %% %% | exmpp_pubsub:subscription_pending()
%% | exmpp_pubsub:subscription_unconfigured() %% %% | exmpp_pubsub:subscription_unconfigured()
). %% ).
-type(subscriptions() -type(subscriptions()
:: [exmpp_pubsub:subscription(),...] :: [exmpp_pubsub:subscription(),...]

1
mod_pubsub_ng/node_flat_dev.erl
View File

@ -29,7 +29,6 @@
-include("pubsub_dev.hrl"). -include("pubsub_dev.hrl").
-include("pubsub_api.hrl"). -include("pubsub_api.hrl").
-include("logger.hrl").
-compile(export_all). -compile(export_all).

1
mod_pubsub_ng/pubsub_db.erl
View File

@ -31,7 +31,6 @@
-include("pubsub_dev.hrl"). -include("pubsub_dev.hrl").
-include("pubsub_api.hrl"). -include("pubsub_api.hrl").
-include("logger.hrl").
-import(pubsub_tools, -import(pubsub_tools,

1
mod_pubsub_ng/pubsub_dev.hrl
View File

@ -2,6 +2,7 @@
%-include_lib("exmpp/include/exmpp.hrl"). %-include_lib("exmpp/include/exmpp.hrl").
%-include_lib("exmpp/include/exmpp_jid.hrl"). %-include_lib("exmpp/include/exmpp_jid.hrl").
-include("logger.hrl").
-include("ejabberd.hrl"). -include("ejabberd.hrl").
-include("mod_roster.hrl"). -include("mod_roster.hrl").
-include("jlib.hrl"). -include("jlib.hrl").

8
mod_pubsub_ng/pubsub_groups.erl
View File

@ -76,10 +76,10 @@
-type(n0des() :: [Node::n0de(),...]). -type(n0des() :: [Node::n0de(),...]).
-type(subscription() %% -type(subscription()
:: {NodeIdx :: exmpp_pubsub:nodeIdx(), %% :: {NodeIdx :: exmpp_pubsub:nodeIdx(),
Groups :: roster_groups()} %% Groups :: roster_groups()}
). %% ).
-type(subscriptions() :: [Subscription::subscription(),...]). -type(subscriptions() :: [Subscription::subscription(),...]).