From 3f938d9e4a3f0d32892e83315d9abcb510cf14bc Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Wed, 26 Mar 2014 22:46:32 +0100
Subject: [PATCH 1/3] windows build fix: add missing member declaration

---
 src/vmime/platforms/windows/windowsSocket.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vmime/platforms/windows/windowsSocket.hpp b/src/vmime/platforms/windows/windowsSocket.hpp
index 8e9df2a1..f2d2f550 100644
--- a/src/vmime/platforms/windows/windowsSocket.hpp
+++ b/src/vmime/platforms/windows/windowsSocket.hpp
@@ -73,6 +73,7 @@ class windowsSocket : public vmime::net::socket
 	const string getPeerAddress() const;
 
 	shared_ptr <net::timeoutHandler> getTimeoutHandler();
+	shared_ptr <net::tracer> m_tracer;
 
 	void setTracer(shared_ptr <net::tracer> tracer);
 	shared_ptr <net::tracer> getTracer();

From 266267be54c5bdc068b68ad61e664ab7c5d32f04 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Fri, 10 Jan 2014 03:20:11 +0100
Subject: [PATCH 2/3] remove -ansi because it interferes with -std=c++11

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index aac379cc..9aa0283b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1020,7 +1020,7 @@ ELSE()
 
 		SET(
 			CMAKE_CXX_FLAGS
-			"${CMAKE_CXX_FLAGS} -D_REENTRANT=1 -W -Wall -ansi -pedantic -Wpointer-arith -Wold-style-cast -Wconversion -Wcast-align -Wno-long-long"
+			"${CMAKE_CXX_FLAGS} -D_REENTRANT=1 -W -Wall -pedantic -Wpointer-arith -Wold-style-cast -Wconversion -Wcast-align -Wno-long-long"
 			CACHE STRING
 			"g++ Compiler Flags"
 			FORCE

From 461316209ef253ebed28cd5a6130eb59264e8115 Mon Sep 17 00:00:00 2001
From: Di3 <liyin@dana-tech.com>
Date: Tue, 1 Apr 2014 11:11:37 +0800
Subject: [PATCH 3/3] Nested classes need to explicitly import and export

---
 src/vmime/fileAttachment.hpp   | 2 +-
 src/vmime/htmlTextPart.hpp     | 2 +-
 src/vmime/net/serviceInfos.hpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/vmime/fileAttachment.hpp b/src/vmime/fileAttachment.hpp
index 1e7a808a..3c6ca398 100644
--- a/src/vmime/fileAttachment.hpp
+++ b/src/vmime/fileAttachment.hpp
@@ -58,7 +58,7 @@ class VMIME_EXPORT fileAttachment : public defaultAttachment
 
 	/** Stores information about a file attachment.
 	  */
-	class fileInfo
+	class VMIME_EXPORT fileInfo
 	{
 	public:
 
diff --git a/src/vmime/htmlTextPart.hpp b/src/vmime/htmlTextPart.hpp
index 4c1a8632..a7fe6aab 100644
--- a/src/vmime/htmlTextPart.hpp
+++ b/src/vmime/htmlTextPart.hpp
@@ -59,7 +59,7 @@ class VMIME_EXPORT htmlTextPart : public textPart
 
 	/** Embedded object (eg: image for &lt;IMG> tag).
 	  */
-	class embeddedObject : public object
+	class VMIME_EXPORT embeddedObject : public object
 	{
 	public:
 
diff --git a/src/vmime/net/serviceInfos.hpp b/src/vmime/net/serviceInfos.hpp
index 6e3209ca..ec4ca7d6 100644
--- a/src/vmime/net/serviceInfos.hpp
+++ b/src/vmime/net/serviceInfos.hpp
@@ -65,7 +65,7 @@ class VMIME_EXPORT serviceInfos
 
 	/** A service property.
 	  */
-	class property
+	class VMIME_EXPORT property
 	{
 	public: