summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/commands/cmd_whois.cpp3
-rw-r--r--src/modules/m_spanningtree/treesocket2.cpp6
-rw-r--r--src/modules/m_spanningtree/whois.cpp3
-rw-r--r--win/configure.cpp8
4 files changed, 7 insertions, 13 deletions
diff --git a/src/commands/cmd_whois.cpp b/src/commands/cmd_whois.cpp
index 8afc23525..29264348c 100644
--- a/src/commands/cmd_whois.cpp
+++ b/src/commands/cmd_whois.cpp
@@ -137,7 +137,7 @@ CmdResult CommandWhois::Handle (const std::vector<std::string>& parameters, User
*/
if (IS_LOCAL(dest) && (!*ServerInstance->Config->HideWhoisServer || parameters.size() > 1))
{
- idle = abs((dest->idle_lastmsg)-ServerInstance->Time());
+ idle = abs((long)((dest->idle_lastmsg)-ServerInstance->Time()));
signon = dest->signon;
}
@@ -154,3 +154,4 @@ CmdResult CommandWhois::Handle (const std::vector<std::string>& parameters, User
return CMD_SUCCESS;
}
+
diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index 5a6a9f301..806b8ab36 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -164,13 +164,13 @@ bool TreeSocket::ProcessLine(std::string &line)
time_t delta = them - Instance->Time();
if ((delta < -600) || (delta > 600))
{
- Instance->SNO->WriteToSnoMask('l',"\2ERROR\2: Your clocks are out by %d seconds (this is more than five minutes). Link aborted, \2PLEASE SYNC YOUR CLOCKS!\2",abs(delta));
- SendError("Your clocks are out by "+ConvToStr(abs(delta))+" seconds (this is more than five minutes). Link aborted, PLEASE SYNC YOUR CLOCKS!");
+ Instance->SNO->WriteToSnoMask('l',"\2ERROR\2: Your clocks are out by %d seconds (this is more than five minutes). Link aborted, \2PLEASE SYNC YOUR CLOCKS!\2",abs((long)delta));
+ SendError("Your clocks are out by "+ConvToStr(abs((long)delta))+" seconds (this is more than five minutes). Link aborted, PLEASE SYNC YOUR CLOCKS!");
return false;
}
else if ((delta < -30) || (delta > 30))
{
- Instance->SNO->WriteToSnoMask('l',"\2WARNING\2: Your clocks are out by %d seconds. Please consider synching your clocks.", abs(delta));
+ Instance->SNO->WriteToSnoMask('l',"\2WARNING\2: Your clocks are out by %d seconds. Please consider synching your clocks.", abs((long)delta));
}
}
this->LinkState = CONNECTED;
diff --git a/src/modules/m_spanningtree/whois.cpp b/src/modules/m_spanningtree/whois.cpp
index 4ee485503..a67b57284 100644
--- a/src/modules/m_spanningtree/whois.cpp
+++ b/src/modules/m_spanningtree/whois.cpp
@@ -46,7 +46,7 @@ bool TreeSocket::Whois(const std::string &prefix, std::deque<std::string> &param
char signon[MAXBUF];
char idle[MAXBUF];
snprintf(signon, MAXBUF, "%lu", (unsigned long)x->signon);
- snprintf(idle, MAXBUF, "%lu", (unsigned long)abs((x->idle_lastmsg) - Instance->Time()));
+ snprintf(idle, MAXBUF, "%lu", (unsigned long)abs((long)((x->idle_lastmsg) - Instance->Time())));
std::deque<std::string> par;
par.push_back(prefix);
par.push_back(signon);
@@ -87,3 +87,4 @@ bool TreeSocket::Whois(const std::string &prefix, std::deque<std::string> &param
return true;
}
+
diff --git a/win/configure.cpp b/win/configure.cpp
index fc6603700..ce3653318 100644
--- a/win/configure.cpp
+++ b/win/configure.cpp
@@ -252,14 +252,6 @@ void Run()
get_string_option("In what directory is the IRCd binary to be placed?", ".", bin_dir);
get_string_option("In what directory are the IRCd libraries to be placed?", "../lib", library_dir);
- printf_c("The following questions will ask you for various figures relating\n"
- "To your IRCd install. Please note that these should usually be left\n"
- "as defaults unless you have a real reason to change them. If they\n"
- "changed, then the values must be identical on all servers on your\n"
- "network, or malfunctions and/or crashes may occur, with the exception\n"
- "of the 'maximum number of clients' setting which may be different on\n"
- "different servers on the network.\n\n");
-
// NOTE: this may seem hackish (generating a batch build script), but it assures the user knows
// what they're doing, and we don't have to mess with copying files and changing around modules.mak
// for the extra libraries. --fez