summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2008-02-13 19:23:01 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2008-02-13 19:23:01 +0000
commit0fed3a06d0f889dc9429f74fcfff9398d2f29add (patch)
tree75faf8d3475f23e45eaad434fa1f5cb4966678bb
parent9b2b280cd00f81f009648378f858196e8cfc00c5 (diff)
Patch provided by danieldg for fixing 3-figure versions in configure
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8926 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--make/utilities.pm2
-rw-r--r--src/modules/extra/m_mysql.cpp2
-rw-r--r--src/modules/extra/m_ziplink.cpp6
3 files changed, 5 insertions, 5 deletions
diff --git a/make/utilities.pm b/make/utilities.pm
index 5ad6def21..9b52e4e94 100644
--- a/make/utilities.pm
+++ b/make/utilities.pm
@@ -182,7 +182,7 @@ sub vcheck($$)
$version2 =~ s/[a-z]//g;
my @v1 = split('\.', $version1);
my @v2 = split('\.', $version2);
- for (my $curr = 0; $curr < scalar(@v1); $curr++)
+ for (my $curr = 0; $curr < scalar(@v2); $curr++)
{
if ($v1[$curr] < $v2[$curr])
{
diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index 8fa717f78..0e9a3a631 100644
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -773,7 +773,7 @@ class ModuleSQL : public Module
ConnMap::iterator iter;
- char* returnval = NULL;
+ const char* returnval = NULL;
if((iter = Connections.find(req->dbid)) != Connections.end())
{
diff --git a/src/modules/extra/m_ziplink.cpp b/src/modules/extra/m_ziplink.cpp
index 83131fcb3..57e14a5be 100644
--- a/src/modules/extra/m_ziplink.cpp
+++ b/src/modules/extra/m_ziplink.cpp
@@ -181,10 +181,10 @@ class ModuleZLib : public Module
else if (strcmp("IS_HOOK", request->GetId()) == 0)
{
/* Attach to an inspsocket */
- char* ret = "OK";
+ const char* ret = "OK";
try
{
- ret = ServerInstance->Config->AddIOHook((Module*)this, (BufferedSocket*)ISR->Sock) ? (char*)"OK" : NULL;
+ ret = ServerInstance->Config->AddIOHook((Module*)this, (BufferedSocket*)ISR->Sock) ? "OK" : NULL;
}
catch (ModuleException& e)
{
@@ -195,7 +195,7 @@ class ModuleZLib : public Module
else if (strcmp("IS_UNHOOK", request->GetId()) == 0)
{
/* Detatch from an inspsocket */
- return ServerInstance->Config->DelIOHook((BufferedSocket*)ISR->Sock) ? (char*)"OK" : NULL;
+ return ServerInstance->Config->DelIOHook((BufferedSocket*)ISR->Sock) ? "OK" : NULL;
}
else if (strcmp("IS_HSDONE", request->GetId()) == 0)
{