aboutsummaryrefslogtreecommitdiffstats
path: root/antispam-plugin.h
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2009-10-31 12:34:36 +0100
committerAlexander Sulfrian <alexander@sulfrian.net>2009-10-31 12:34:36 +0100
commitc8a9a6550b84412f919b772a9cb8db1e3ef79d19 (patch)
tree270e253e13f67b366970cf2f07f5c06dd4257520 /antispam-plugin.h
parentaad2cd42ee3d71920648b649e759403b0cb0e138 (diff)
parent771fe630d71993b9d270a9a6145ecaa8510c4f1c (diff)
downloaddovecot-antispam-c8a9a6550b84412f919b772a9cb8db1e3ef79d19.tar.gz
dovecot-antispam-c8a9a6550b84412f919b772a9cb8db1e3ef79d19.tar.xz
dovecot-antispam-c8a9a6550b84412f919b772a9cb8db1e3ef79d19.zip
Merge remote branch 'base/master'
Diffstat (limited to '')
-rw-r--r--antispam-plugin.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/antispam-plugin.h b/antispam-plugin.h
index 493fd1e..38a3be6 100644
--- a/antispam-plugin.h
+++ b/antispam-plugin.h
@@ -8,6 +8,7 @@
#include "dict.h"
#include "imap-search.h"
#include "dovecot-version.h"
+#include <stdlib.h>
#define __stringify_1(x) #x
#define stringify(x) __stringify_1(x)
@@ -84,7 +85,7 @@ extern bool need_folder_hook;
* Dovecot version compat code
*/
-#if DOVECOT_VERSION_CODE(1, 1) == DOVECOT_VERSION || DOVECOT_VERSION_CODE(1, 2) == DOVECOT_VERSION
+#if DOVECOT_VERSION_CODE(1, 1, 0) == DOVECOT_VERSION || DOVECOT_VERSION_CODE(1, 2, 0) == DOVECOT_VERSION
#define __attr_unused__ ATTR_UNUSED
#define ME(err) MAIL_ERROR_ ##err,
#define PLUGIN_ID uint32_t PLUGIN_FUNCTION(id) = 0
@@ -113,7 +114,7 @@ o_stream_create_from_fd(int fd, pool_t pool ATTR_UNUSED)
return o_stream_create_fd(fd, 0, TRUE);
}
-#if DOVECOT_VERSION_CODE(1, 2) == DOVECOT_VERSION
+#if DOVECOT_VERSION_CODE(1, 2, 0) == DOVECOT_VERSION
static inline struct dict *
string_dict_init(const char *uri, const char *username)
{
@@ -131,7 +132,7 @@ string_dict_init(const char *uri, const char *username)
return dict_init(uri, DICT_DATA_TYPE_STRING, username);
}
#endif
-#elif DOVECOT_VERSION_CODE(1, 0) == DOVECOT_VERSION
+#elif DOVECOT_VERSION_CODE(1, 0, 0) == DOVECOT_VERSION
#define ME(err)
#define PLUGIN_ID
#define str_array_length(x) strarray_length(x)