summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorAdam <Adam@anope.org>2013-03-01 00:57:24 -0500
committerAdam <Adam@anope.org>2013-03-01 00:57:24 -0500
commit91ad9d22cad8c1da3134975852ba1f732b55dabe (patch)
treef93eb451755e2e531c75d2c16ced8c96f17e243c /modules
parent6aa9ad938a4923bd730516aa97a6e19643fd5c57 (diff)
Fix Windows build
Diffstat (limited to 'modules')
-rw-r--r--modules/database/db_flatfile.cpp2
-rw-r--r--modules/encryption/enc_old.cpp2
-rw-r--r--modules/extra/dns.h4
3 files changed, 5 insertions, 3 deletions
diff --git a/modules/database/db_flatfile.cpp b/modules/database/db_flatfile.cpp
index 848356574..09fde3242 100644
--- a/modules/database/db_flatfile.cpp
+++ b/modules/database/db_flatfile.cpp
@@ -242,6 +242,7 @@ class DBFlatFile : public Module, public Pipe
BackupDatabase();
int i = -1;
+#ifndef _WIN32
if (use_fork)
{
i = fork();
@@ -250,6 +251,7 @@ class DBFlatFile : public Module, public Pipe
else if (i < 0)
Log(this) << "Unable to fork for database save";
}
+#endif
try
{
diff --git a/modules/encryption/enc_old.cpp b/modules/encryption/enc_old.cpp
index 03debc65a..dad8bb91f 100644
--- a/modules/encryption/enc_old.cpp
+++ b/modules/encryption/enc_old.cpp
@@ -30,7 +30,7 @@ class OldMD5Provider : public Encryption::Provider
{
if (md5)
return md5->GetDefaultIV();
- return Encryption::IV(NULL, 0);
+ return Encryption::IV(static_cast<const uint32_t *>(NULL), 0);
}
};
diff --git a/modules/extra/dns.h b/modules/extra/dns.h
index 4eba1630c..469bb0e82 100644
--- a/modules/extra/dns.h
+++ b/modules/extra/dns.h
@@ -56,7 +56,7 @@ namespace DNS
ERROR_NONE,
ERROR_UNKNOWN,
ERROR_UNLOADED,
- ERROR_TIMEOUT,
+ ERROR_TIMEDOUT,
ERROR_NOT_AN_ANSWER,
ERROR_NONSTANDARD_QUERY,
ERROR_FORMAT_ERROR,
@@ -166,7 +166,7 @@ namespace DNS
{
Log(LOG_DEBUG_2) << "Resolver: timeout for query " << this->name;
Query rr(*this);
- rr.error = ERROR_TIMEOUT;
+ rr.error = ERROR_TIMEDOUT;
this->OnError(&rr);
}
};