aboutsummaryrefslogtreecommitdiff
path: root/src/ejabberd.hrl
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2008-03-13 14:13:29 +0000
committerBadlop <badlop@process-one.net>2008-03-13 14:13:29 +0000
commit7c377783fa35d1c243bcd16ae8271b25da0f6b11 (patch)
tree7dbd3a596353f395e4c7d2ffb4a1417badef07e7 /src/ejabberd.hrl
parent* doc/guide.tex: Describe option Matches in mod_vcard_ldap (thanks (diff)
* src/ejabberd.hrl: Removed unused ejabberd_debug and
PRIVACY_SUPPORT. Reordered the remaining options SVN Revision: 1230
Diffstat (limited to 'src/ejabberd.hrl')
-rw-r--r--src/ejabberd.hrl29
1 files changed, 14 insertions, 15 deletions
diff --git a/src/ejabberd.hrl b/src/ejabberd.hrl
index 8401e5cd4..c6a975321 100644
--- a/src/ejabberd.hrl
+++ b/src/ejabberd.hrl
@@ -19,11 +19,22 @@
%%%
%%%----------------------------------------------------------------------
-%-define(ejabberd_debug, true).
-%-define(DBGFSM, true).
-
-define(VERSION, "2.1.0-alpha").
+-define(MYHOSTS, ejabberd_config:get_global_option(hosts)).
+-define(MYNAME, hd(ejabberd_config:get_global_option(hosts))).
+-define(MYLANG, ejabberd_config:get_global_option(language)).
+
+-define(MSGS_DIR, "msgs").
+-define(CONFIG_PATH, "ejabberd.cfg").
+-define(LOG_PATH, "ejabberd.log").
+
+-define(EJABBERD_URI, "http://www.process-one.net/en/ejabberd/").
+
+-define(S2STIMEOUT, 600000).
+
+%%-define(DBGFSM, true).
+
%% ---------------------------------
%% Logging mechanism
@@ -42,15 +53,3 @@
-define(CRITICAL_MSG(Format, Args),
ejabberd_logger:critical_msg(?MODULE,?LINE,Format, Args)).
--define(MYHOSTS, ejabberd_config:get_global_option(hosts)).
--define(MYNAME, hd(ejabberd_config:get_global_option(hosts))).
--define(S2STIMEOUT, 600000).
--define(MYLANG, ejabberd_config:get_global_option(language)).
-
--define(MSGS_DIR, "msgs").
--define(CONFIG_PATH, "ejabberd.cfg").
--define(LOG_PATH, "ejabberd.log").
-
--define(PRIVACY_SUPPORT, true).
-
--define(EJABBERD_URI, "http://www.process-one.net/en/ejabberd/").