always build the dotlock program standalone, many other appplications use

[apps/madmutt.git] / mx.c

diff --git a/mx.c b/mx.c
index 5348821..b596bca 100644 (file)
--- a/mx.c
+++ b/mx.c
@@ -18,12 +18,13 @@
 #include <lib-lib/macros.h>
 #include <lib-lib/file.h>
 
+#include <lib-mime/mime.h>
+
 #include "mutt.h"
 #include "buffy.h"
 #include "mx.h"
 #include "mbox.h"
 #include "mh.h"
-#include "rfc2047.h"
 #include "sort.h"
 #include "thread.h"
 #include "copy.h"
@@ -82,8 +83,6 @@ static list2_t* MailboxFormats = NULL;
  * retry - should retry if unable to lock?
  */
 
-#ifdef DL_STANDALONE
-
 static int invoke_dotlock (const char *path, int dummy, int flags, int retry)
 {
   char cmd[LONG_STRING + _POSIX_PATH_MAX];
@@ -108,12 +107,6 @@ static int invoke_dotlock (const char *path, int dummy, int flags, int retry)
   return mutt_system (cmd);
 }
 
-#else
-
-#define invoke_dotlock dotlock_invoke
-
-#endif
-
 static int dotlock_file (const char *path, int fd, int retry)
 {
   int r;
@@ -1122,7 +1115,7 @@ int mx_sync_mailbox (CONTEXT* ctx, int* index_hint) {
 MESSAGE *mx_open_new_message (CONTEXT * dest, HEADER * hdr, int flags)
 {
   MESSAGE *msg;
-  ADDRESS *p = NULL;
+  address_t *p = NULL;
 
   if (!MX_IDX(dest->magic-1)) {
     debug_print (1, ("function unimplemented for mailbox type %d.\n", dest->magic));