diff options
| author | DukePyrolator <DukePyrolator@anope.org> | 2010-12-23 07:15:32 +0100 |
|---|---|---|
| committer | DukePyrolator <DukePyrolator@anope.org> | 2010-12-23 07:15:32 +0100 |
| commit | a0ad3c4fef7e35c68dee128950ef95c0c56849fe (patch) | |
| tree | a9096244ac74dc31d959e9b6426453de90c28d03 /include | |
| parent | 184e7b3f64beb104e2d676048fc5bf485c5ad743 (diff) | |
| parent | 265006b69176e1d8130284c63bcb50a1b67a426f (diff) | |
Merge branch '1.9' of ssh://anope.git.sourceforge.net/gitroot/anope/anope into 1.9
Diffstat (limited to 'include')
| -rw-r--r-- | include/extern.h | 1 | ||||
| -rw-r--r-- | include/operserv.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/extern.h b/include/extern.h index 59d0c238e..7dc49e929 100644 --- a/include/extern.h +++ b/include/extern.h @@ -352,7 +352,6 @@ E void do_kill(User *user, const Anope::string &reason); E bool is_excepted(ChannelInfo *ci, User *user); E bool is_excepted_mask(ChannelInfo *ci, const Anope::string &mask); -E bool match_usermask(const Anope::string &mask, User *user); E Anope::string create_mask(User *u); /******************************************************************************/ diff --git a/include/operserv.h b/include/operserv.h index 8bac11e76..20d24ae5d 100644 --- a/include/operserv.h +++ b/include/operserv.h @@ -142,11 +142,13 @@ class CoreExport XLineManager */ virtual XLine *Add(BotInfo *bi, User *u, const Anope::string &mask, time_t expires, const Anope::string &reason); + private: /** Delete an XLine, eg, remove it from the IRCd. * @param x The xline */ virtual void Del(XLine *x); + public: /** Checks if a mask can/should be added to the XLineManager * @param mask The mask * @param expires When the mask would expire |