diff options
| -rw-r--r-- | src/protocol/inspircd11.c | 6 | ||||
| -rw-r--r-- | src/send.c | 17 | ||||
| -rw-r--r-- | version.log | 6 |
3 files changed, 16 insertions, 13 deletions
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c index 19c673e46..71278ab56 100644 --- a/src/protocol/inspircd11.c +++ b/src/protocol/inspircd11.c @@ -711,6 +711,9 @@ int anope_event_fjoin(char *source, int ac, char **av) { char *newav[10]; + /* value used for myStrGetToken */ + int curtoken = 0; + /* storing the current nick */ char *curnick; @@ -724,9 +727,6 @@ int anope_event_fjoin(char *source, int ac, char **av) *nicklist = '\0'; *prefixandnick = '\0'; - /* value used for myStrGetToken */ - int curtoken = 0; - if (ac < 3) return MOD_CONT; diff --git a/src/send.c b/src/send.c index 0f5179de6..352cd3b00 100644 --- a/src/send.c +++ b/src/send.c @@ -136,9 +136,8 @@ void notice_user(char *source, User * u, const char *fmt, ...) * - The user is not registered and NSDefMsg is enabled * - The user is registered and has set /ns set msg on */ - if (UsePrivmsg - && ((!u->na && (NSDefFlags & NI_MSG)) - || (u->na && (u->na->nc->flags & NI_MSG)))) { + if (UsePrivmsg && ((!u->na && (NSDefFlags & NI_MSG)) + || (u->na && (u->na->nc->flags & NI_MSG)))) { anope_cmd_privmsg2(source, u->nick, buf); } else { anope_cmd_notice2(source, u->nick, buf); @@ -208,9 +207,9 @@ void notice_lang(char *source, User * dest, int message, ...) * - The user is not registered and NSDefMsg is enabled * - The user is registered and has set /ns set msg on */ - if (UsePrivmsg - && ((!dest->na && (NSDefFlags & NI_MSG)) - || (dest->na && (dest->na->nc->flags & NI_MSG)))) { + if (UsePrivmsg && ((!dest->na && (NSDefFlags & NI_MSG)) + || (dest->na + && (dest->na->nc->flags & NI_MSG)))) { anope_cmd_privmsg2(source, dest->nick, *t ? t : " "); } else { anope_cmd_notice2(source, dest->nick, *t ? t : " "); @@ -264,9 +263,9 @@ void notice_help(char *source, User * dest, int message, ...) * - The user is not registered and NSDefMsg is enabled * - The user is registered and has set /ns set msg on */ - if (UsePrivmsg - && ((!dest->na && (NSDefFlags & NI_MSG)) - || (dest->na && (dest->na->nc->flags & NI_MSG)))) { + if (UsePrivmsg && ((!dest->na && (NSDefFlags & NI_MSG)) + || (dest->na + && (dest->na->nc->flags & NI_MSG)))) { anope_cmd_privmsg2(source, dest->nick, *outbuf ? outbuf : " "); } else { anope_cmd_notice2(source, dest->nick, *outbuf ? outbuf : " "); diff --git a/version.log b/version.log index eca7b2a84..a424e103b 100644 --- a/version.log +++ b/version.log @@ -9,10 +9,14 @@ VERSION_MAJOR="1" VERSION_MINOR="7" VERSION_PATCH="18" VERSION_EXTRA="-svn" -VERSION_BUILD="1245" +VERSION_BUILD="1246" # $Log$ # +# BUILD : 1.7.18 (1246) +# BUGS : +# NOTES : Fixed possible compile error with inspircd11 on win32 +# # BUILD : 1.7.18 (1245) # BUGS : 671 # NOTES : NSDefKill can now only be enabled if UsePrivmsg is also enabled; NSDefKill is now used instead of UsePrivmsg to determine whether unregistered users receive PRIVMSGs or NOTICEs |