diff options
| author | Vincent Richard <[email protected]> | 2014-04-01 20:39:26 +0000 |
|---|---|---|
| committer | Vincent Richard <[email protected]> | 2014-04-01 20:39:26 +0000 |
| commit | 8a6b959cf003928ca825f285cd3517f76ae6c6af (patch) | |
| tree | e9e652d500c099b4dfe468c4f689239b9c641050 /src | |
| parent | Added missing VMIME_HAVE_TLS_SUPPORT guards (pull request #74). (diff) | |
| parent | Merge pull request #75 from di3online/master (diff) | |
| download | vmime-8a6b959cf003928ca825f285cd3517f76ae6c6af.tar.gz vmime-8a6b959cf003928ca825f285cd3517f76ae6c6af.zip | |
Merge branch 'master' of https://github.com/kisli/vmime
Diffstat (limited to 'src')
| -rw-r--r-- | src/vmime/fileAttachment.hpp | 2 | ||||
| -rw-r--r-- | src/vmime/htmlTextPart.hpp | 2 | ||||
| -rw-r--r-- | src/vmime/net/serviceInfos.hpp | 2 | ||||
| -rw-r--r-- | src/vmime/platforms/windows/windowsSocket.hpp | 1 |
4 files changed, 4 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 @@ public: /** 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 @@ public: /** Embedded object (eg: image for <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 @@ public: /** A service property. */ - class property + class VMIME_EXPORT property { public: 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 @@ public: 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(); |