X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compress.c;h=dcf614314bda56130574a9303922bcf504074846;hp=47f50c5b7c489025110098defbb135861880bc41;hb=ecfcc6df70230ba136c2fb3843700ecb749c41b7;hpb=b3cb6ed8d36c550a2e589910ce51bbc8352ff57c

diff --git a/compress.c b/compress.c
index 47f50c5..dcf6143 100644
--- a/compress.c
+++ b/compress.c
@@ -8,18 +8,17 @@
  */
 
 #include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
 
-#include "mutt.h"
+#include <lib-ui/curses.h>
 
-#ifdef USE_COMPRESSED
+#include "mutt.h"
 
 #include "mx.h"
 #include "mbox.h"
-#include "mutt_curses.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
 #include "lib/debug.h"
 
 #include <errno.h>
@@ -132,7 +131,7 @@ static void set_path (CONTEXT * ctx)
 
   /* Uncompress to /tmp */
   mutt_mktemp (tmppath);
-  ctx->path = p_dupstr(tmppath, str_len(tmppath));
+  ctx->path = p_dupstr(tmppath, m_strlen(tmppath));
 }
 
 static int get_size (const char *path)
@@ -190,7 +189,7 @@ static char *get_compression_cmd (const char *cmd, const CONTEXT * ctx)
 
   mutt_FormatString (expanded, sizeof (expanded), cmd,
                      compresshook_format_str, (unsigned long) ctx, 0);
-  return str_dup (expanded);
+  return m_strdup(expanded);
 }
 
 int mutt_check_mailbox_compressed (CONTEXT * ctx)
@@ -487,5 +486,3 @@ mx_t* compress_reg_mx (void) {
   fmt->mx_open_mailbox = mutt_open_read_compressed;
   return (fmt);
 }
-
-#endif /* USE_COMPRESSED */