From a6c8a6a9f2c3f6c0fda6e5bdfeecc3af8c9b5708 Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Thu, 23 Dec 2010 23:33:02 -0500
Subject: Prevent version.cpp from prepending version.sh's VERSION_EXTRA on
 every build

---
 include/version.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/version.cpp b/include/version.cpp
index 9b8f38c45..8cf362726 100644
--- a/include/version.cpp
+++ b/include/version.cpp
@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
 	for (std::list<std::pair<std::string, std::string> >::iterator it = versions.begin(), it_end = versions.end(); it != it_end; ++it)
 	{
 		if (it->first == "EXTRA")
-			fd << "#define VERSION_EXTRA \"" << (!version_extra.empty() ? version_extra : "") << it->second << "\"" << std::endl;
+			fd << "#define VERSION_EXTRA \"" << (!version_extra.empty() ? version_extra : "") << (version_extra.find(it->second) == std::string::npos ? it->second  : "") << "\"" << std::endl;
 		else
 			fd << "#define VERSION_" << it->first << " " << it->second << std::endl;
 	}
-- 
cgit 


From 35e328bcb60a431d9e8ee86c40df571d3653c451 Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Fri, 24 Dec 2010 01:23:22 -0500
Subject: Fixed Windows build

---
 include/commands.h | 2 +-
 include/hashcomp.h | 4 ++--
 include/services.h | 2 +-
 include/sockets.h  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'include')

diff --git a/include/commands.h b/include/commands.h
index 6c7ef7494..f05b1a5db 100644
--- a/include/commands.h
+++ b/include/commands.h
@@ -44,7 +44,7 @@ enum CommandFlag
 };
 
 /* The source for a command */
-struct CommandSource
+struct CoreExport CommandSource
 {
 	/* User executing the command */
 	User *u;
diff --git a/include/hashcomp.h b/include/hashcomp.h
index b99b97aa4..fa502b498 100644
--- a/include/hashcomp.h
+++ b/include/hashcomp.h
@@ -176,7 +176,7 @@ namespace irc
 
 	/** Used to hash irc::strings for unordered_map
 	 */
-	struct hash
+	struct CoreExport hash
 	{
 		/* VS 2008 specific code */
 		enum { bucket_size = 4, min_buckets = 8 };
@@ -253,7 +253,7 @@ namespace ci
 
 	/** Used to hash ci::strings for unordered_map
 	 */
-	struct hash
+	struct CoreExport hash
 	{
 		/* VS 2008 specific code */
 		enum { bucket_size = 4, min_buckets = 8 };
diff --git a/include/services.h b/include/services.h
index d86729e51..5448d9170 100644
--- a/include/services.h
+++ b/include/services.h
@@ -765,7 +765,7 @@ enum EntryType
 	ENTRYTYPE_HOST
 };
 
-class Entry : public Flags<EntryType>
+class CoreExport Entry : public Flags<EntryType>
 {
 	Anope::string mask;
 
diff --git a/include/sockets.h b/include/sockets.h
index c9e5bfed0..d5457cf05 100644
--- a/include/sockets.h
+++ b/include/sockets.h
@@ -340,7 +340,7 @@ class CoreExport ConnectionSocket : public BufferedSocket
 	void Connect(const Anope::string &TargetHost, int Port, const Anope::string &BindHost = "");
 };
 
-class ClientSocket : public BufferedSocket
+class CoreExport ClientSocket : public BufferedSocket
 {
  public:
 	/* Listen socket this connection came from */
-- 
cgit