Fixed Windows build

6 files changed, 12 insertions, 15 deletions

diff --git a/include/anope.h b/include/anope.h
index fe46dc0ed..64efacc82 100644
--- a/include/anope.h
+++ b/include/anope.h
@@ -16,7 +16,7 @@
 #include <set>
 #include "hashcomp.h"
 
-struct Message;
+class Message;
 
 namespace Anope
 {
@@ -291,7 +291,7 @@ namespace Anope
 	/** The current system time, which is pretty close to being accurate.
 	 * Use this unless you need very specific time checks
 	 */
-	extern time_t CurTime;
+	extern CoreExport time_t CurTime;
 
 	extern CoreExport string Version();
 
diff --git a/include/config.h b/include/config.h
index 839af5db8..ff6608b1e 100644
--- a/include/config.h
+++ b/include/config.h
@@ -387,12 +387,11 @@ struct MultiConfig
 	MultiNotify finish_function;
 };
 
-/** This class holds the bulk of the runtime configuration for the ircd.
+/** This class holds the bulk of the runtime configuration for Anope.
  * It allows for reading new config values, accessing configuration files,
- * and storage of the configuration data needed to run the ircd, such as
- * the servername, connect classes, /ADMIN data, MOTDs and filenames etc.
+ * and storage of the configuration data needed to run Anope.
  */
-class ServerConfig
+class CoreExport ServerConfig
 {
  private:
 	/** Check that there is only one of each configuration item
diff --git a/include/dns.h b/include/dns.h
index 44e8d515b..cbadc3916 100644
--- a/include/dns.h
+++ b/include/dns.h
@@ -44,7 +44,7 @@ enum DNSError
 	DNS_ERROR_NOT_IMPLEMENTED,
 	DNS_ERROR_REFUSED,
 	DNS_ERROR_NO_RECORDS,
-	DNS_ERROR_INVALID_TYPE
+	DNS_ERROR_INVALIDTYPE
 };
 
 class DNSRequestTimeout; // Forward declarations
@@ -53,7 +53,7 @@ class Module;
 
 /** The request
  */
-class DNSRequest
+class CoreExport DNSRequest
 {
 	/* Timeout timer for this request */
 	DNSRequestTimeout *timeout;
diff --git a/include/modules.h b/include/modules.h
index 4377975b1..e47b5612b 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -27,7 +27,7 @@
 # define dlsym(file, symbol) (HMODULE)GetProcAddress(file, symbol)
 # define dlclose(file) FreeLibrary(file) ? 0 : 1
 # define ano_modclearerr() SetLastError(0)
-# define ano_moderr() LastError().c_str()
+# define ano_moderr() Anope::LastError().c_str()
 #else
 	typedef void * ano_module_t;
 
@@ -123,11 +123,9 @@ else \
 # ifndef RTLD_LOCAL
 #  define RTLD_LOCAL 0
 # endif
-#else
-	const char *ano_moderr();
 #endif
 
-struct Message;
+class Message;
 
 extern CoreExport Module *FindModule(const Anope::string &name);
 int protocol_module_init();
@@ -1265,8 +1263,9 @@ class service_reference : public dynamic_reference<T>
 	}
 };
 
-struct Message
+class CoreExport Message
 {
+public:
 	Anope::string name;
 	bool (*func)(const Anope::string &source, const std::vector<Anope::string> &params);
 
diff --git a/include/services.h b/include/services.h
index 4a02cadb9..55993cd1f 100644
--- a/include/services.h
+++ b/include/services.h
@@ -78,7 +78,6 @@
 # define inet_pton inet_pton_
 # define inet_ntop inet_ntop_
 # define MARK_DEPRECATED
-# define EINPROGRESS WSAEWOULDBLOCK
 
 extern CoreExport int inet_pton(int af, const char *src, void *dst);
 extern CoreExport const char *inet_ntop(int af, const void *src, char *dst, size_t size);
diff --git a/include/users.h b/include/users.h
index 5abf6bbca..889eca357 100644
--- a/include/users.h
+++ b/include/users.h
@@ -17,7 +17,7 @@ typedef unordered_map_namespace::unordered_map<Anope::string, User *, Anope::has
 extern CoreExport user_map UserListByNick;
 extern CoreExport user_uid_map UserListByUID;
 
-class ChannelStatus : public Flags<ChannelModeName, CMODE_END * 2>
+class CoreExport ChannelStatus : public Flags<ChannelModeName, CMODE_END * 2>
 {
  public:
 	Anope::string BuildCharPrefixList() const;