diff options
Diffstat (limited to '')
72 files changed, 530 insertions, 57 deletions
diff --git a/vmime.doxygen b/Doxyfile.in index 50960e13..4b9d5e49 100644 --- a/vmime.doxygen +++ b/Doxyfile.in @@ -29,7 +29,7 @@ PROJECT_NUMBER = # If a relative path is entered, it will be relative to the location # where doxygen was started. If left blank the current directory will be used. -OUTPUT_DIRECTORY = ./doc/ +OUTPUT_DIRECTORY = @CMAKE_CURRENT_BINARY_DIR@/doc/ # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this @@ -344,7 +344,7 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = ./src/ ./vmime/ +INPUT = @CMAKE_CURRENT_SOURCE_DIR@/src/ @CMAKE_CURRENT_SOURCE_DIR@/vmime/ # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp diff --git a/vmime/base.hpp b/vmime/base.hpp index 957793d3..b1bf7aca 100644 --- a/vmime/base.hpp +++ b/vmime/base.hpp @@ -78,7 +78,7 @@ namespace vmime } template <typename T, size_t N> - inline size_t count(T const (&array)[N]) + inline size_t count(T const (&/* array */)[N]) { return (N); } diff --git a/vmime/exception.hpp b/vmime/exception.hpp index 5b68bd7e..fe96fb7e 100644 --- a/vmime/exception.hpp +++ b/vmime/exception.hpp @@ -362,6 +362,21 @@ public: }; +/** The URL is malformed. + */ + +class malformed_url : public vmime::exception +{ +public: + + malformed_url(const string& error, const exception& other = NO_EXCEPTION); + ~malformed_url() throw(); + + exception* clone() const; + const char* name() const throw(); +}; + + #if VMIME_HAVE_MESSAGING_FEATURES @@ -727,21 +742,6 @@ public: }; -/** The URL is malformed. - */ - -class malformed_url : public net_exception -{ -public: - - malformed_url(const string& error, const exception& other = NO_EXCEPTION); - ~malformed_url() throw(); - - exception* clone() const; - const char* name() const throw(); -}; - - /** Folder name is invalid. */ diff --git a/vmime/fileAttachment.hpp b/vmime/fileAttachment.hpp index 1516a9da..d75e36fe 100644 --- a/vmime/fileAttachment.hpp +++ b/vmime/fileAttachment.hpp @@ -25,8 +25,13 @@ #define VMIME_FILEATTACHMENT_HPP_INCLUDED -#include "vmime/defaultAttachment.hpp" +#include "vmime/config.hpp" + + +#if VMIME_HAVE_FILESYSTEM_FEATURES + +#include "vmime/defaultAttachment.hpp" #include "vmime/dateTime.hpp" @@ -185,4 +190,6 @@ private: } // vmime +#endif // VMIME_HAVE_FILESYSTEM_FEATURES + #endif // VMIME_FILEATTACHMENT_HPP_INCLUDED diff --git a/vmime/net/connectionInfos.hpp b/vmime/net/connectionInfos.hpp index 03f01b90..68ecf3e2 100644 --- a/vmime/net/connectionInfos.hpp +++ b/vmime/net/connectionInfos.hpp @@ -25,6 +25,12 @@ #define VMIME_NET_CONNECTIONINFOS_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES + + #include "vmime/object.hpp" @@ -56,5 +62,7 @@ public: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES + #endif // VMIME_NET_CONNECTIONINFOS_HPP_INCLUDED diff --git a/vmime/net/defaultConnectionInfos.hpp b/vmime/net/defaultConnectionInfos.hpp index 518b4bcd..eaf966e9 100644 --- a/vmime/net/defaultConnectionInfos.hpp +++ b/vmime/net/defaultConnectionInfos.hpp @@ -25,6 +25,12 @@ #define VMIME_NET_DEFAULTCONNECTIONINFOS_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES + + #include "vmime/net/connectionInfos.hpp" @@ -54,5 +60,7 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES + #endif // VMIME_NET_DEFAULTCONNECTIONINFOS_HPP_INCLUDED diff --git a/vmime/net/events.hpp b/vmime/net/events.hpp index be05c6e2..6b9e7f00 100644 --- a/vmime/net/events.hpp +++ b/vmime/net/events.hpp @@ -25,6 +25,12 @@ #define VMIME_NET_EVENTS_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES + + #include <vector> #include "vmime/utility/path.hpp" @@ -230,4 +236,6 @@ public: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES + #endif // VMIME_NET_EVENTS_HPP_INCLUDED diff --git a/vmime/net/folder.hpp b/vmime/net/folder.hpp index a50ee0e5..56214299 100644 --- a/vmime/net/folder.hpp +++ b/vmime/net/folder.hpp @@ -25,6 +25,12 @@ #define VMIME_NET_FOLDER_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES + + #include <vector> #include "vmime/types.hpp" @@ -434,4 +440,6 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES + #endif // VMIME_NET_FOLDER_HPP_INCLUDED diff --git a/vmime/net/imap/IMAPConnection.hpp b/vmime/net/imap/IMAPConnection.hpp index 820987b3..f766e95e 100644 --- a/vmime/net/imap/IMAPConnection.hpp +++ b/vmime/net/imap/IMAPConnection.hpp @@ -27,6 +27,10 @@ #include "vmime/config.hpp" + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_IMAP + + #include "vmime/net/socket.hpp" #include "vmime/net/timeoutHandler.hpp" #include "vmime/net/session.hpp" @@ -141,4 +145,6 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_IMAP + #endif // VMIME_NET_IMAP_IMAPCONNECTION_HPP_INCLUDED diff --git a/vmime/net/imap/IMAPFolder.hpp b/vmime/net/imap/IMAPFolder.hpp index 33378581..5471ac49 100644 --- a/vmime/net/imap/IMAPFolder.hpp +++ b/vmime/net/imap/IMAPFolder.hpp @@ -25,6 +25,12 @@ #define VMIME_NET_IMAP_IMAPFOLDER_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_IMAP + + #include <vector> #include <map> @@ -167,4 +173,6 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_IMAP + #endif // VMIME_NET_IMAP_IMAPFOLDER_HPP_INCLUDED diff --git a/vmime/net/imap/IMAPMessage.hpp b/vmime/net/imap/IMAPMessage.hpp index 06f80919..3be8edb9 100644 --- a/vmime/net/imap/IMAPMessage.hpp +++ b/vmime/net/imap/IMAPMessage.hpp @@ -25,6 +25,12 @@ #define VMIME_NET_IMAP_IMAPMESSAGE_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_IMAP + + #include "vmime/net/message.hpp" #include "vmime/net/folder.hpp" @@ -137,4 +143,6 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_IMAP + #endif // VMIME_NET_IMAP_IMAPMESSAGE_HPP_INCLUDED diff --git a/vmime/net/imap/IMAPMessagePartContentHandler.hpp b/vmime/net/imap/IMAPMessagePartContentHandler.hpp index 75a03afd..a251bb13 100644 --- a/vmime/net/imap/IMAPMessagePartContentHandler.hpp +++ b/vmime/net/imap/IMAPMessagePartContentHandler.hpp @@ -25,6 +25,12 @@ #define VMIME_NET_IMAP_IMAPMESSAGEPARTCONTENTHANDLER_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_IMAP + + #include "vmime/contentHandler.hpp" #include "vmime/net/imap/IMAPMessage.hpp" @@ -71,5 +77,7 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_IMAP + #endif // VMIME_NET_IMAP_IMAPMESSAGEPARTCONTENTHANDLER_HPP_INCLUDED diff --git a/vmime/net/imap/IMAPParser.hpp b/vmime/net/imap/IMAPParser.hpp index f4305103..dd220c73 100644 --- a/vmime/net/imap/IMAPParser.hpp +++ b/vmime/net/imap/IMAPParser.hpp @@ -25,6 +25,12 @@ #define VMIME_NET_IMAP_IMAPPARSER_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_IMAP + + #include "vmime/base.hpp" #include "vmime/dateTime.hpp" #include "vmime/charset.hpp" @@ -5200,4 +5206,6 @@ public: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_IMAP + #endif // VMIME_NET_IMAP_IMAPPARSER_HPP_INCLUDED diff --git a/vmime/net/imap/IMAPPart.hpp b/vmime/net/imap/IMAPPart.hpp index d84db1bd..a0625f55 100644 --- a/vmime/net/imap/IMAPPart.hpp +++ b/vmime/net/imap/IMAPPart.hpp @@ -25,6 +25,12 @@ #define VMIME_NET_IMAP_IMAPPART_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_IMAP + + #include "vmime/net/message.hpp" #include "vmime/net/imap/IMAPParser.hpp" @@ -84,5 +90,7 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_IMAP + #endif // VMIME_NET_IMAP_IMAPPART_HPP_INCLUDED diff --git a/vmime/net/imap/IMAPSStore.hpp b/vmime/net/imap/IMAPSStore.hpp index 5772ad96..b9b83f7a 100644 --- a/vmime/net/imap/IMAPSStore.hpp +++ b/vmime/net/imap/IMAPSStore.hpp @@ -25,6 +25,12 @@ #define VMIME_NET_IMAP_IMAPSSTORE_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_IMAP + + #include "vmime/net/imap/IMAPStore.hpp" @@ -59,5 +65,7 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_IMAP + #endif // VMIME_NET_IMAP_IMAPSSTORE_HPP_INCLUDED diff --git a/vmime/net/imap/IMAPServiceInfos.hpp b/vmime/net/imap/IMAPServiceInfos.hpp index 7286b3a8..70c23d14 100644 --- a/vmime/net/imap/IMAPServiceInfos.hpp +++ b/vmime/net/imap/IMAPServiceInfos.hpp @@ -26,6 +26,11 @@ #include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_IMAP + + #include "vmime/net/serviceInfos.hpp" @@ -80,5 +85,7 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_IMAP + #endif // VMIME_NET_IMAP_IMAPSERVICEINFOS_HPP_INCLUDED diff --git a/vmime/net/imap/IMAPStore.hpp b/vmime/net/imap/IMAPStore.hpp index ebff2e66..3964e35b 100644 --- a/vmime/net/imap/IMAPStore.hpp +++ b/vmime/net/imap/IMAPStore.hpp @@ -27,6 +27,10 @@ #include "vmime/config.hpp" + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_IMAP + + #include "vmime/net/store.hpp" #include "vmime/net/socket.hpp" #include "vmime/net/folder.hpp" @@ -110,4 +114,6 @@ protected: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_IMAP + #endif // VMIME_NET_IMAP_IMAPSTORE_HPP_INCLUDED diff --git a/vmime/net/imap/IMAPStructure.hpp b/vmime/net/imap/IMAPStructure.hpp index e43676c8..abf76bba 100644 --- a/vmime/net/imap/IMAPStructure.hpp +++ b/vmime/net/imap/IMAPStructure.hpp @@ -25,6 +25,12 @@ #define VMIME_NET_IMAP_IMAPSTRUCTURE_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_IMAP + + #include "vmime/net/message.hpp" #include "vmime/net/imap/IMAPParser.hpp" @@ -63,5 +69,7 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_IMAP + #endif // VMIME_NET_IMAP_IMAPSTRUCTURE_HPP_INCLUDED diff --git a/vmime/net/imap/IMAPTag.hpp b/vmime/net/imap/IMAPTag.hpp index cab2d480..05d374fb 100644 --- a/vmime/net/imap/IMAPTag.hpp +++ b/vmime/net/imap/IMAPTag.hpp @@ -25,6 +25,12 @@ #define VMIME_NET_IMAP_IMAPTAG_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_IMAP + + #include "vmime/types.hpp" @@ -67,4 +73,6 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_IMAP + #endif // VMIME_NET_IMAP_IMAPTAG_HPP_INCLUDED diff --git a/vmime/net/imap/IMAPUtils.hpp b/vmime/net/imap/IMAPUtils.hpp index 9c9c4205..356c60ff 100644 --- a/vmime/net/imap/IMAPUtils.hpp +++ b/vmime/net/imap/IMAPUtils.hpp @@ -25,6 +25,12 @@ #define VMIME_NET_IMAP_IMAPUTILS_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_IMAP + + #include "vmime/types.hpp" #include "vmime/dateTime.hpp" @@ -146,4 +152,6 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_IMAP + #endif // VMIME_NET_IMAP_IMAPUTILS_HPP_INCLUDED diff --git a/vmime/net/maildir/format/courierMaildirFormat.hpp b/vmime/net/maildir/format/courierMaildirFormat.hpp index e8036d51..ab040bc5 100644 --- a/vmime/net/maildir/format/courierMaildirFormat.hpp +++ b/vmime/net/maildir/format/courierMaildirFormat.hpp @@ -25,6 +25,12 @@ #define VMIME_NET_MAILDIR_FORMAT_COURIERMAILDIRFORMAT_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_MAILDIR + + #include "vmime/net/maildir/maildirFormat.hpp" @@ -109,5 +115,7 @@ protected: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_MAILDIR + #endif // VMIME_NET_MAILDIR_FORMAT_COURIERMAILDIRFORMAT_HPP_INCLUDED diff --git a/vmime/net/maildir/format/kmailMaildirFormat.hpp b/vmime/net/maildir/format/kmailMaildirFormat.hpp index e5f72223..cb218d17 100644 --- a/vmime/net/maildir/format/kmailMaildirFormat.hpp +++ b/vmime/net/maildir/format/kmailMaildirFormat.hpp @@ -25,6 +25,12 @@ #define VMIME_NET_MAILDIR_FORMAT_KMAILMAILDIRFORMAT_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_MAILDIR + + #include "vmime/net/maildir/maildirFormat.hpp" @@ -96,5 +102,8 @@ protected: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_MAILDIR + + #endif // VMIME_NET_MAILDIR_FORMAT_KMAILMAILDIRFORMAT_HPP_INCLUDED diff --git a/vmime/net/maildir/maildirFolder.hpp b/vmime/net/maildir/maildirFolder.hpp index c9ba8996..f13f2782 100644 --- a/vmime/net/maildir/maildirFolder.hpp +++ b/vmime/net/maildir/maildirFolder.hpp @@ -25,6 +25,12 @@ #define VMIME_NET_MAILDIR_MAILDIRFOLDER_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_MAILDIR + + #include <vector> #include <map> @@ -187,4 +193,6 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_MAILDIR + #endif // VMIME_NET_MAILDIR_MAILDIRFOLDER_HPP_INCLUDED diff --git a/vmime/net/maildir/maildirFormat.hpp b/vmime/net/maildir/maildirFormat.hpp index 09406966..cd6c58f2 100644 --- a/vmime/net/maildir/maildirFormat.hpp +++ b/vmime/net/maildir/maildirFormat.hpp @@ -25,6 +25,12 @@ #define VMIME_NET_MAILDIR_FORMAT_MAILDIRFORMAT_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_MAILDIR + + #include "vmime/net/folder.hpp" #include "vmime/utility/file.hpp" @@ -183,5 +189,7 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_MAILDIR + #endif // VMIME_NET_MAILDIR_FORMAT_MAILDIRFORMAT_HPP_INCLUDED diff --git a/vmime/net/maildir/maildirMessage.hpp b/vmime/net/maildir/maildirMessage.hpp index cd66d43c..f680a20d 100644 --- a/vmime/net/maildir/maildirMessage.hpp +++ b/vmime/net/maildir/maildirMessage.hpp @@ -25,6 +25,12 @@ #define VMIME_NET_MAILDIR_MAILDIRMESSAGE_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_MAILDIR + + #include "vmime/net/message.hpp" #include "vmime/net/folder.hpp" @@ -106,4 +112,6 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_MAILDIR + #endif // VMIME_NET_MAILDIR_MAILDIRMESSAGE_HPP_INCLUDED diff --git a/vmime/net/maildir/maildirServiceInfos.hpp b/vmime/net/maildir/maildirServiceInfos.hpp index f3b0df81..046cd2e1 100644 --- a/vmime/net/maildir/maildirServiceInfos.hpp +++ b/vmime/net/maildir/maildirServiceInfos.hpp @@ -26,6 +26,11 @@ #include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_MAILDIR + + #include "vmime/net/serviceInfos.hpp" @@ -60,5 +65,7 @@ public: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_MAILDIR + #endif // VMIME_NET_MAILDIR_MAILDIRSERVICEINFOS_HPP_INCLUDED diff --git a/vmime/net/maildir/maildirStore.hpp b/vmime/net/maildir/maildirStore.hpp index 40ecec3f..99564f7d 100644 --- a/vmime/net/maildir/maildirStore.hpp +++ b/vmime/net/maildir/maildirStore.hpp @@ -27,6 +27,10 @@ #include "vmime/config.hpp" + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_MAILDIR + + #include "vmime/net/store.hpp" #include "vmime/net/socket.hpp" #include "vmime/net/folder.hpp" @@ -111,4 +115,6 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_MAILDIR + #endif // VMIME_NET_MAILDIR_MAILDIRSTORE_HPP_INCLUDED diff --git a/vmime/net/maildir/maildirUtils.hpp b/vmime/net/maildir/maildirUtils.hpp index c4aa0b66..2b155730 100644 --- a/vmime/net/maildir/maildirUtils.hpp +++ b/vmime/net/maildir/maildirUtils.hpp @@ -25,6 +25,12 @@ #define VMIME_NET_MAILDIR_MAILDIRUTILS_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_MAILDIR + + #include "vmime/utility/file.hpp" #include "vmime/utility/path.hpp" @@ -131,4 +137,6 @@ public: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_MAILDIR + #endif // VMIME_NET_MAILDIR_MAILDIRUTILS_HPP_INCLUDED diff --git a/vmime/net/message.hpp b/vmime/net/message.hpp index 1fbd008d..e25e8cd2 100644 --- a/vmime/net/message.hpp +++ b/vmime/net/message.hpp @@ -25,6 +25,12 @@ #define VMIME_NET_MESSAGE_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES + + #include "vmime/header.hpp" #include "vmime/mediaType.hpp" @@ -306,4 +312,6 @@ public: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES + #endif // VMIME_NET_MESSAGE_HPP_INCLUDED diff --git a/vmime/net/pop3/POP3Folder.hpp b/vmime/net/pop3/POP3Folder.hpp index 090f948b..88e42e9b 100644 --- a/vmime/net/pop3/POP3Folder.hpp +++ b/vmime/net/pop3/POP3Folder.hpp @@ -25,10 +25,15 @@ #define VMIME_NET_POP3_POP3FOLDER_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_POP3 + + #include <vector> #include <map> -#include "vmime/config.hpp" #include "vmime/types.hpp" #include "vmime/net/folder.hpp" @@ -155,4 +160,6 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_POP3 + #endif // VMIME_NET_POP3_POP3FOLDER_HPP_INCLUDED diff --git a/vmime/net/pop3/POP3Message.hpp b/vmime/net/pop3/POP3Message.hpp index 337cc5d5..5c7209f3 100644 --- a/vmime/net/pop3/POP3Message.hpp +++ b/vmime/net/pop3/POP3Message.hpp @@ -27,6 +27,10 @@ #include "vmime/config.hpp" + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_POP3 + + #include "vmime/net/message.hpp" #include "vmime/net/folder.hpp" @@ -101,4 +105,6 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_POP3 + #endif // VMIME_NET_POP3_POP3MESSAGE_HPP_INCLUDED diff --git a/vmime/net/pop3/POP3SStore.hpp b/vmime/net/pop3/POP3SStore.hpp index 1f98bfaf..ca1200ec 100644 --- a/vmime/net/pop3/POP3SStore.hpp +++ b/vmime/net/pop3/POP3SStore.hpp @@ -25,6 +25,12 @@ #define VMIME_NET_POP3_POP3SSTORE_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_POP3 + + #include "vmime/net/pop3/POP3Store.hpp" @@ -59,5 +65,7 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_POP3 + #endif // VMIME_NET_POP3_POP3SSTORE_HPP_INCLUDED diff --git a/vmime/net/pop3/POP3ServiceInfos.hpp b/vmime/net/pop3/POP3ServiceInfos.hpp index d2dff587..def58670 100644 --- a/vmime/net/pop3/POP3ServiceInfos.hpp +++ b/vmime/net/pop3/POP3ServiceInfos.hpp @@ -26,6 +26,11 @@ #include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_POP3 + + #include "vmime/net/serviceInfos.hpp" @@ -82,5 +87,7 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_POP3 + #endif // VMIME_NET_POP3_POP3SERVICEINFOS_HPP_INCLUDED diff --git a/vmime/net/pop3/POP3Store.hpp b/vmime/net/pop3/POP3Store.hpp index 16fcce47..816e16c3 100644 --- a/vmime/net/pop3/POP3Store.hpp +++ b/vmime/net/pop3/POP3Store.hpp @@ -26,6 +26,11 @@ #include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_POP3 + + #include "vmime/messageId.hpp" #include "vmime/net/store.hpp" @@ -142,4 +147,6 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_POP3 + #endif // VMIME_NET_POP3_POP3STORE_HPP_INCLUDED diff --git a/vmime/net/pop3/POP3Utils.hpp b/vmime/net/pop3/POP3Utils.hpp index 2640c0e6..65d5043d 100644 --- a/vmime/net/pop3/POP3Utils.hpp +++ b/vmime/net/pop3/POP3Utils.hpp @@ -25,9 +25,14 @@ #define VMIME_NET_POP3_POP3UTILS_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_POP3 + + #include <map> -#include "vmime/config.hpp" #include "vmime/types.hpp" @@ -63,5 +68,7 @@ public: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_POP3 + #endif // VMIME_NET_POP3_POP3UTILS_HPP_INCLUDED diff --git a/vmime/net/securedConnectionInfos.hpp b/vmime/net/securedConnectionInfos.hpp index b27d30bd..d3bbf003 100644 --- a/vmime/net/securedConnectionInfos.hpp +++ b/vmime/net/securedConnectionInfos.hpp @@ -25,6 +25,12 @@ #define VMIME_NET_SECUREDCONNECTIONINFOS_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES + + #include "vmime/net/connectionInfos.hpp" @@ -43,5 +49,7 @@ class securedConnectionInfos : public connectionInfos } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES + #endif // VMIME_NET_SECUREDCONNECTIONINFOS_HPP_INCLUDED diff --git a/vmime/net/sendmail/sendmailServiceInfos.hpp b/vmime/net/sendmail/sendmailServiceInfos.hpp index a86a4dd4..1b2c57d4 100644 --- a/vmime/net/sendmail/sendmailServiceInfos.hpp +++ b/vmime/net/sendmail/sendmailServiceInfos.hpp @@ -26,10 +26,12 @@ #include "vmime/config.hpp" -#include "vmime/net/serviceInfos.hpp" -#if VMIME_BUILTIN_PLATFORM_POSIX +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_SENDMAIL + + +#include "vmime/net/serviceInfos.hpp" namespace vmime { @@ -63,8 +65,7 @@ public: } // vmime -#endif // VMIME_BUILTIN_PLATFORM_POSIX - +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_SENDMAIL #endif // VMIME_NET_SENDMAIL_SENDMAILSERVICEINFOS_HPP_INCLUDED diff --git a/vmime/net/sendmail/sendmailTransport.hpp b/vmime/net/sendmail/sendmailTransport.hpp index 5ff8cf2a..eefb46ac 100644 --- a/vmime/net/sendmail/sendmailTransport.hpp +++ b/vmime/net/sendmail/sendmailTransport.hpp @@ -27,6 +27,10 @@ #include "vmime/config.hpp" + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_SENDMAIL + + #include "vmime/net/transport.hpp" #include "vmime/net/socket.hpp" #include "vmime/net/timeoutHandler.hpp" @@ -34,9 +38,6 @@ #include "vmime/net/sendmail/sendmailServiceInfos.hpp" -#if VMIME_BUILTIN_PLATFORM_POSIX - - namespace vmime { namespace net { namespace sendmail { @@ -91,7 +92,6 @@ private: } // vmime -#endif // VMIME_BUILTIN_PLATFORM_POSIX - +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_SENDMAIL #endif // VMIME_NET_SENDMAIL_SENDMAILTRANSPORT_HPP_INCLUDED diff --git a/vmime/net/service.hpp b/vmime/net/service.hpp index 5205feea..8c1d1059 100644 --- a/vmime/net/service.hpp +++ b/vmime/net/service.hpp @@ -26,6 +26,11 @@ #include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES + + #include "vmime/types.hpp" #include "vmime/net/session.hpp" @@ -223,4 +228,6 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES + #endif // VMIME_NET_SERVICE_HPP_INCLUDED diff --git a/vmime/net/serviceFactory.hpp b/vmime/net/serviceFactory.hpp index 0362b472..e752004c 100644 --- a/vmime/net/serviceFactory.hpp +++ b/vmime/net/serviceFactory.hpp @@ -25,6 +25,12 @@ #define VMIME_NET_SERVICEFACTORY_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES + + #include <map> #include "vmime/types.hpp" @@ -157,4 +163,6 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES + #endif // VMIME_NET_SERVICEFACTORY_HPP_INCLUDED diff --git a/vmime/net/serviceInfos.hpp b/vmime/net/serviceInfos.hpp index eac77a1d..6a973627 100644 --- a/vmime/net/serviceInfos.hpp +++ b/vmime/net/serviceInfos.hpp @@ -25,6 +25,12 @@ #define VMIME_NET_SERVICEINFOS_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES + + #include <vector> #include "vmime/types.hpp" @@ -235,4 +241,6 @@ public: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES + #endif // VMIME_NET_SERVICEINFOS_HPP_INCLUDED diff --git a/vmime/net/session.hpp b/vmime/net/session.hpp index 426fe7a5..3aa5ef93 100644 --- a/vmime/net/session.hpp +++ b/vmime/net/session.hpp @@ -25,6 +25,12 @@ #define VMIME_NET_SESSION_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES + + #include "vmime/security/authenticator.hpp" #include "vmime/utility/url.hpp" @@ -145,4 +151,6 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES + #endif // VMIME_NET_SESSION_HPP_INCLUDED diff --git a/vmime/net/smtp/SMTPResponse.hpp b/vmime/net/smtp/SMTPResponse.hpp index 5ef4f09b..265e16fe 100644 --- a/vmime/net/smtp/SMTPResponse.hpp +++ b/vmime/net/smtp/SMTPResponse.hpp @@ -25,6 +25,12 @@ #define VMIME_NET_SMTP_SMTPRESPONSE_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_SMTP + + #include "vmime/object.hpp" #include "vmime/base.hpp" @@ -138,5 +144,7 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_SMTP + #endif // VMIME_NET_SMTP_SMTPRESPONSE_HPP_INCLUDED diff --git a/vmime/net/smtp/SMTPSTransport.hpp b/vmime/net/smtp/SMTPSTransport.hpp index 393a4f58..cb26fb26 100644 --- a/vmime/net/smtp/SMTPSTransport.hpp +++ b/vmime/net/smtp/SMTPSTransport.hpp @@ -25,6 +25,12 @@ #define VMIME_NET_SMTP_SMTPSSTORE_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_SMTP + + #include "vmime/net/smtp/SMTPTransport.hpp" @@ -59,5 +65,7 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_SMTP + #endif // VMIME_NET_SMTP_SMTPSSTORE_HPP_INCLUDED diff --git a/vmime/net/smtp/SMTPServiceInfos.hpp b/vmime/net/smtp/SMTPServiceInfos.hpp index 61f5aa8b..db6abc25 100644 --- a/vmime/net/smtp/SMTPServiceInfos.hpp +++ b/vmime/net/smtp/SMTPServiceInfos.hpp @@ -26,6 +26,11 @@ #include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_SMTP + + #include "vmime/net/serviceInfos.hpp" @@ -81,5 +86,7 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_SMTP + #endif // VMIME_NET_SMTP_SMTPSERVICEINFOS_HPP_INCLUDED diff --git a/vmime/net/smtp/SMTPTransport.hpp b/vmime/net/smtp/SMTPTransport.hpp index 050fedde..a8b4558b 100644 --- a/vmime/net/smtp/SMTPTransport.hpp +++ b/vmime/net/smtp/SMTPTransport.hpp @@ -27,6 +27,10 @@ #include "vmime/config.hpp" + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_SMTP + + #include "vmime/net/transport.hpp" #include "vmime/net/socket.hpp" #include "vmime/net/timeoutHandler.hpp" @@ -109,4 +113,6 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_SMTP + #endif // VMIME_NET_SMTP_SMTPTRANSPORT_HPP_INCLUDED diff --git a/vmime/net/socket.hpp b/vmime/net/socket.hpp index b3946494..0fac6514 100644 --- a/vmime/net/socket.hpp +++ b/vmime/net/socket.hpp @@ -25,6 +25,12 @@ #define VMIME_NET_SOCKET_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES + + #include "vmime/base.hpp" #include "vmime/net/timeoutHandler.hpp" @@ -138,4 +144,6 @@ public: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES + #endif // VMIME_NET_SOCKET_HPP_INCLUDED diff --git a/vmime/net/store.hpp b/vmime/net/store.hpp index 1c9ac1cb..f1f16bdb 100644 --- a/vmime/net/store.hpp +++ b/vmime/net/store.hpp @@ -25,6 +25,12 @@ #define VMIME_NET_STORE_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES + + #include "vmime/net/service.hpp" #include "vmime/net/folder.hpp" @@ -103,4 +109,6 @@ public: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES + #endif // VMIME_NET_STORE_HPP_INCLUDED diff --git a/vmime/net/timeoutHandler.hpp b/vmime/net/timeoutHandler.hpp index 6a206658..58d14b40 100644 --- a/vmime/net/timeoutHandler.hpp +++ b/vmime/net/timeoutHandler.hpp @@ -25,6 +25,12 @@ #define VMIME_NET_TIMEOUTHANDLER_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES + + #include "vmime/types.hpp" @@ -78,4 +84,6 @@ public: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES + #endif // VMIME_NET_TIMEOUTHANDLER_HPP_INCLUDED diff --git a/vmime/net/tls/TLSSecuredConnectionInfos.hpp b/vmime/net/tls/TLSSecuredConnectionInfos.hpp index d0e40870..eb94dbfc 100644 --- a/vmime/net/tls/TLSSecuredConnectionInfos.hpp +++ b/vmime/net/tls/TLSSecuredConnectionInfos.hpp @@ -25,6 +25,12 @@ #define VMIME_NET_TLSSECUREDCONNECTIONINFOS_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_TLS_SUPPORT + + #include "vmime/net/securedConnectionInfos.hpp" #include "vmime/security/cert/certificateChain.hpp" @@ -72,5 +78,7 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_TLS_SUPPORT + #endif // VMIME_NET_TLSSECUREDCONNECTIONINFOS_HPP_INCLUDED diff --git a/vmime/net/tls/TLSSession.hpp b/vmime/net/tls/TLSSession.hpp index e6bd64fd..75241c8c 100644 --- a/vmime/net/tls/TLSSession.hpp +++ b/vmime/net/tls/TLSSession.hpp @@ -25,6 +25,12 @@ #define VMIME_NET_TLS_TLSSESSION_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_TLS_SUPPORT && VMIME_TLS_SUPPORT_LIB_IS_GNUTLS + + #include "vmime/types.hpp" #include "vmime/net/tls/TLSSocket.hpp" @@ -91,5 +97,7 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_TLS_SUPPORT && VMIME_TLS_SUPPORT_LIB_IS_GNUTLS + #endif // VMIME_NET_TLS_TLSSESSION_HPP_INCLUDED diff --git a/vmime/net/tls/TLSSocket.hpp b/vmime/net/tls/TLSSocket.hpp index 7c389702..e88d424c 100644 --- a/vmime/net/tls/TLSSocket.hpp +++ b/vmime/net/tls/TLSSocket.hpp @@ -25,6 +25,12 @@ #define VMIME_NET_TLS_TLSSOCKET_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_TLS_SUPPORT && VMIME_TLS_SUPPORT_LIB_IS_GNUTLS + + #include "vmime/exception.hpp" #include "vmime/net/socket.hpp" @@ -123,5 +129,7 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_TLS_SUPPORT && VMIME_TLS_SUPPORT_LIB_IS_GNUTLS + #endif // VMIME_NET_TLS_TLSSOCKET_HPP_INCLUDED diff --git a/vmime/net/transport.hpp b/vmime/net/transport.hpp index 45dc5a51..f0b8e2dd 100644 --- a/vmime/net/transport.hpp +++ b/vmime/net/transport.hpp @@ -25,6 +25,12 @@ #define VMIME_NET_TRANSPORT_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES + + #include "vmime/net/service.hpp" #include "vmime/utility/stream.hpp" @@ -78,4 +84,6 @@ public: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES + #endif // VMIME_NET_TRANSPORT_HPP_INCLUDED diff --git a/vmime/platform.hpp b/vmime/platform.hpp index 02815542..2063268e 100644 --- a/vmime/platform.hpp +++ b/vmime/platform.hpp @@ -52,7 +52,7 @@ class platform { public: - /** Handles all platform-dependent operations. It offers an interface to + /** Takes care of all platform-dependent operations. It offers an interface to * access platform-dependent objects: sockets, date/time, file system, etc. */ @@ -135,13 +135,8 @@ public: sm_handler = vmime::create <TYPE>(); } - static ref <handler> getHandler() - { - if (!sm_handler) - throw exceptions::no_platform_handler(); - - return (sm_handler); - } + static ref <handler> getDefaultHandler(); + static ref <handler> getHandler(); private: @@ -149,10 +144,6 @@ private: }; -/** Compatibility with older versions of VMime (before 0.8.1). */ -typedef platform platformDependant; - - } // vmime diff --git a/vmime/platforms/posix/posixChildProcess.hpp b/vmime/platforms/posix/posixChildProcess.hpp index c25aaca3..c9d34506 100644 --- a/vmime/platforms/posix/posixChildProcess.hpp +++ b/vmime/platforms/posix/posixChildProcess.hpp @@ -25,6 +25,12 @@ #define VMIME_PLATFORMS_POSIX_POSIXCHILDPROCESS_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_PLATFORM_IS_POSIX && VMIME_HAVE_FILESYSTEM_FEATURES + + #include "vmime/utility/childProcess.hpp" #include <sys/types.h> @@ -80,5 +86,7 @@ public: } // vmime +#endif // VMIME_PLATFORM_IS_POSIX && VMIME_HAVE_FILESYSTEM_FEATURES + #endif // VMIME_PLATFORMS_POSIX_POSIXCHILDPROCESS_HPP_INCLUDED diff --git a/vmime/platforms/posix/posixFile.hpp b/vmime/platforms/posix/posixFile.hpp index 704b7b00..654764d1 100644 --- a/vmime/platforms/posix/posixFile.hpp +++ b/vmime/platforms/posix/posixFile.hpp @@ -25,11 +25,14 @@ #define VMIME_PLATFORMS_POSIX_FILE_HPP_INCLUDED -#include "vmime/utility/file.hpp" -#include "vmime/utility/seekableInputStream.hpp" +#include "vmime/config.hpp" + +#if VMIME_PLATFORM_IS_POSIX && VMIME_HAVE_FILESYSTEM_FEATURES -#if VMIME_HAVE_FILESYSTEM_FEATURES + +#include "vmime/utility/file.hpp" +#include "vmime/utility/seekableInputStream.hpp" #include <dirent.h> @@ -209,6 +212,6 @@ public: } // vmime -#endif // VMIME_HAVE_FILESYSTEM_FEATURES +#endif // VMIME_PLATFORM_IS_POSIX && VMIME_HAVE_FILESYSTEM_FEATURES #endif // VMIME_PLATFORMS_POSIX_FILE_HPP_INCLUDED diff --git a/vmime/platforms/posix/posixHandler.hpp b/vmime/platforms/posix/posixHandler.hpp index 8e572a21..80cfb650 100644 --- a/vmime/platforms/posix/posixHandler.hpp +++ b/vmime/platforms/posix/posixHandler.hpp @@ -26,6 +26,11 @@ #include "vmime/config.hpp" + + +#if VMIME_PLATFORM_IS_POSIX + + #include "vmime/platform.hpp" #if VMIME_HAVE_MESSAGING_FEATURES @@ -90,4 +95,6 @@ private: } // vmime +#endif // VMIME_PLATFORM_IS_POSIX + #endif // VMIME_PLATFORMS_POSIX_HANDLER_HPP_INCLUDED diff --git a/vmime/platforms/posix/posixSocket.hpp b/vmime/platforms/posix/posixSocket.hpp index 7e0c2d39..1332505b 100644 --- a/vmime/platforms/posix/posixSocket.hpp +++ b/vmime/platforms/posix/posixSocket.hpp @@ -25,10 +25,13 @@ #define VMIME_PLATFORMS_POSIX_SOCKET_HPP_INCLUDED -#include "vmime/net/socket.hpp" +#include "vmime/config.hpp" + +#if VMIME_PLATFORM_IS_POSIX && VMIME_HAVE_MESSAGING_FEATURES -#if VMIME_HAVE_MESSAGING_FEATURES + +#include "vmime/net/socket.hpp" namespace vmime { @@ -83,6 +86,6 @@ public: } // vmime -#endif // VMIME_HAVE_MESSAGING_FEATURES +#endif // VMIME_PLATFORM_IS_POSIX && VMIME_HAVE_MESSAGING_FEATURES #endif // VMIME_PLATFORMS_POSIX_SOCKET_HPP_INCLUDED diff --git a/vmime/platforms/windows/windowsFile.hpp b/vmime/platforms/windows/windowsFile.hpp index f4170329..696803d6 100644 --- a/vmime/platforms/windows/windowsFile.hpp +++ b/vmime/platforms/windows/windowsFile.hpp @@ -25,13 +25,17 @@ #define VMIME_PLATFORMS_WINDOWS_FILE_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_PLATFORM_IS_WINDOWS && VMIME_HAVE_FILESYSTEM_FEATURES + + #include "vmime/utility/file.hpp" #include "vmime/utility/seekableInputStream.hpp" #include <windows.h> -#if VMIME_HAVE_FILESYSTEM_FEATURES - namespace vmime { namespace platforms { @@ -209,6 +213,6 @@ private: } // vmime -#endif // VMIME_HAVE_FILESYSTEM_FEATURES +#endif // VMIME_PLATFORM_IS_WINDOWS && VMIME_HAVE_FILESYSTEM_FEATURES #endif // VMIME_PLATFORMS_WINDOWS_FILE_HPP_INCLUDED diff --git a/vmime/platforms/windows/windowsHandler.hpp b/vmime/platforms/windows/windowsHandler.hpp index 53df3636..4f0150f8 100644 --- a/vmime/platforms/windows/windowsHandler.hpp +++ b/vmime/platforms/windows/windowsHandler.hpp @@ -26,6 +26,11 @@ #include "vmime/config.hpp" + + +#if VMIME_PLATFORM_IS_WINDOWS + + #include "vmime/platform.hpp" #if VMIME_HAVE_MESSAGING_FEATURES @@ -88,4 +93,6 @@ private: } // vmime +#endif // VMIME_PLATFORM_IS_WINDOWS + #endif // VMIME_PLATFORMS_WINDOWS_HANDLER_HPP_INCLUDED diff --git a/vmime/platforms/windows/windowsSocket.hpp b/vmime/platforms/windows/windowsSocket.hpp index 1c89aeb5..c41d8bfe 100644 --- a/vmime/platforms/windows/windowsSocket.hpp +++ b/vmime/platforms/windows/windowsSocket.hpp @@ -25,11 +25,14 @@ #define VMIME_PLATFORMS_WINDOWS_SOCKET_HPP_INCLUDED -#include <winsock2.h> -#include "vmime/net/socket.hpp" +#include "vmime/config.hpp" + +#if VMIME_PLATFORM_IS_WINDOWS && VMIME_HAVE_MESSAGING_FEATURES -#if VMIME_HAVE_MESSAGING_FEATURES + +#include <winsock2.h> +#include "vmime/net/socket.hpp" namespace vmime { @@ -82,6 +85,6 @@ public: } // vmime -#endif // VMIME_HAVE_MESSAGING_FEATURES +#endif // VMIME_PLATFORM_IS_WINDOWS && VMIME_HAVE_MESSAGING_FEATURES #endif // VMIME_PLATFORMS_WINDOWS_SOCKET_HPP_INCLUDED diff --git a/vmime/security/authenticator.hpp b/vmime/security/authenticator.hpp index a31fc5ef..4664e417 100644 --- a/vmime/security/authenticator.hpp +++ b/vmime/security/authenticator.hpp @@ -25,6 +25,12 @@ #define VMIME_SECURITY_AUTHENTICATOR_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES + + #include "vmime/types.hpp" @@ -116,5 +122,7 @@ public: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES + #endif // VMIME_SECURITY_AUTHENTICATOR_HPP_INCLUDED diff --git a/vmime/security/cert/X509Certificate.hpp b/vmime/security/cert/X509Certificate.hpp index b916cff5..48fc882c 100644 --- a/vmime/security/cert/X509Certificate.hpp +++ b/vmime/security/cert/X509Certificate.hpp @@ -145,7 +145,7 @@ public: private: - class X509CertificateInternalData* m_data; + struct X509CertificateInternalData* m_data; }; diff --git a/vmime/security/defaultAuthenticator.hpp b/vmime/security/defaultAuthenticator.hpp index dfb82983..f9e9a4bf 100644 --- a/vmime/security/defaultAuthenticator.hpp +++ b/vmime/security/defaultAuthenticator.hpp @@ -25,6 +25,12 @@ #define VMIME_SECURITY_DEFAULTAUTHENTICATOR_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES + + #include "vmime/security/authenticator.hpp" @@ -61,5 +67,7 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES + #endif // VMIME_SECURITY_DEFAULTAUTHENTICATOR_HPP_INCLUDED diff --git a/vmime/security/sasl/SASLAuthenticator.hpp b/vmime/security/sasl/SASLAuthenticator.hpp index daa090ac..1573dc20 100644 --- a/vmime/security/sasl/SASLAuthenticator.hpp +++ b/vmime/security/sasl/SASLAuthenticator.hpp @@ -25,6 +25,12 @@ #define VMIME_SECURITY_SASL_SASLAUTHENTICATOR_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_SASL_SUPPORT + + #include "vmime/types.hpp" #include "vmime/security/authenticator.hpp" @@ -84,5 +90,7 @@ public: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_SASL_SUPPORT + #endif // VMIME_SECURITY_SASL_SASLAUTHENTICATOR_HPP_INCLUDED diff --git a/vmime/security/sasl/SASLContext.hpp b/vmime/security/sasl/SASLContext.hpp index 7703ab1d..acdb8b5a 100644 --- a/vmime/security/sasl/SASLContext.hpp +++ b/vmime/security/sasl/SASLContext.hpp @@ -25,6 +25,12 @@ #define VMIME_SECURITY_SASL_SASLCONTEXT_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_SASL_SUPPORT + + #include "vmime/types.hpp" #include "vmime/security/sasl/SASLSession.hpp" @@ -116,5 +122,7 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_SASL_SUPPORT + #endif // VMIME_SECURITY_SASL_SASLCONTEXT_HPP_INCLUDED diff --git a/vmime/security/sasl/SASLMechanism.hpp b/vmime/security/sasl/SASLMechanism.hpp index dbb7cd28..678a3030 100644 --- a/vmime/security/sasl/SASLMechanism.hpp +++ b/vmime/security/sasl/SASLMechanism.hpp @@ -25,6 +25,12 @@ #define VMIME_SECURITY_SASL_SASLMECHANISM_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_SASL_SUPPORT + + #include "vmime/types.hpp" @@ -119,5 +125,7 @@ public: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_SASL_SUPPORT + #endif // VMIME_SECURITY_SASL_SASLMECHANISM_HPP_INCLUDED diff --git a/vmime/security/sasl/SASLMechanismFactory.hpp b/vmime/security/sasl/SASLMechanismFactory.hpp index 7b860613..064637a6 100644 --- a/vmime/security/sasl/SASLMechanismFactory.hpp +++ b/vmime/security/sasl/SASLMechanismFactory.hpp @@ -25,6 +25,12 @@ #define VMIME_SECURITY_SASL_SASLMECHANISMFACTORY_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_SASL_SUPPORT + + #include "vmime/types.hpp" #include "vmime/base.hpp" @@ -131,5 +137,7 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_SASL_SUPPORT + #endif // VMIME_SECURITY_SASL_SASLMECHANISMFACTORY_HPP_INCLUDED diff --git a/vmime/security/sasl/SASLSession.hpp b/vmime/security/sasl/SASLSession.hpp index 79acfa92..63645b18 100644 --- a/vmime/security/sasl/SASLSession.hpp +++ b/vmime/security/sasl/SASLSession.hpp @@ -25,6 +25,12 @@ #define VMIME_SECURITY_SASL_SASLSESSION_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_SASL_SUPPORT + + #include "vmime/types.hpp" #include "vmime/security/sasl/SASLAuthenticator.hpp" @@ -150,5 +156,7 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_SASL_SUPPORT + #endif // VMIME_SECURITY_SASL_SASLSESSION_HPP_INCLUDED diff --git a/vmime/security/sasl/SASLSocket.hpp b/vmime/security/sasl/SASLSocket.hpp index 03483315..f05ed424 100644 --- a/vmime/security/sasl/SASLSocket.hpp +++ b/vmime/security/sasl/SASLSocket.hpp @@ -25,6 +25,12 @@ #define VMIME_SECURITY_SASL_SASLSOCKET_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_SASL_SUPPORT + + #include "vmime/types.hpp" #include "vmime/net/socket.hpp" @@ -78,5 +84,7 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_SASL_SUPPORT + #endif // VMIME_SECURITY_SASL_SASLSOCKET_HPP_INCLUDED diff --git a/vmime/security/sasl/builtinSASLMechanism.hpp b/vmime/security/sasl/builtinSASLMechanism.hpp index ac7421cf..aa6c360c 100644 --- a/vmime/security/sasl/builtinSASLMechanism.hpp +++ b/vmime/security/sasl/builtinSASLMechanism.hpp @@ -25,6 +25,12 @@ #define VMIME_SECURITY_SASL_BUILTINSASLMECHANISM_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_SASL_SUPPORT + + #include "vmime/security/sasl/SASLMechanism.hpp" @@ -81,5 +87,7 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_SASL_SUPPORT + #endif // VMIME_SECURITY_SASL_BUILTINSASLMECHANISM_HPP_INCLUDED diff --git a/vmime/security/sasl/defaultSASLAuthenticator.hpp b/vmime/security/sasl/defaultSASLAuthenticator.hpp index 7595de79..aeb9ce47 100644 --- a/vmime/security/sasl/defaultSASLAuthenticator.hpp +++ b/vmime/security/sasl/defaultSASLAuthenticator.hpp @@ -25,6 +25,12 @@ #define VMIME_SECURITY_SASL_DEFAULTSASLAUTHENTICATOR_HPP_INCLUDED +#include "vmime/config.hpp" + + +#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_SASL_SUPPORT + + #include "vmime/security/sasl/SASLAuthenticator.hpp" #include "vmime/security/defaultAuthenticator.hpp" @@ -78,5 +84,7 @@ private: } // vmime +#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_SASL_SUPPORT + #endif // VMIME_SECURITY_SASL_DEFAULTSASLAUTHENTICATOR_HPP_INCLUDED |