small fix

[apps/madmutt.git] / main.c

diff --git a/main.c b/main.c
index aaa8877..9af3581 100644 (file)
--- a/main.c
+++ b/main.c
@@ -19,6 +19,9 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
+
 #include "mutt.h"
 #include "mutt_curses.h"
 #include "keymap.h"
@@ -27,8 +30,6 @@
 #include "mutt_idna.h"
 #include "xterm.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/debug.h"
 
@@ -42,6 +43,9 @@
 
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#else
+extern char *optarg;
+extern int optind;
 #endif
 
 #ifdef HAVE_LIBIDN
@@ -56,7 +60,7 @@
 #include <libesmtp.h>
 #endif
 
-#if USE_HCACHE
+#ifdef USE_HCACHE
 #if HAVE_QDBM
 #include <depot.h>
 #elif HAVE_GDBM
@@ -229,7 +233,7 @@ static void show_version (void)
   printf ("  libESMTP %s\n", buf);
 #endif
 
-#if USE_HCACHE
+#ifdef USE_HCACHE
 #if HAVE_QDBM
   printf ("  qdbm %s\n", dpversion);
 #elif HAVE_GDBM
@@ -297,7 +301,7 @@ static void show_version (void)
 #else
          "-USE_INODESORT   "
 #endif
-#if USE_HCACHE
+#ifdef USE_HCACHE
          "+USE_HCACHE  "
 #else
          "-USE_HCACHE  "
@@ -573,8 +577,6 @@ int main (int argc, char **argv)
   int i;
   int explicit_folder = 0;
   int dump_variables = -1;
-  extern char *optarg;
-  extern int optind;
 
   /* initialize random number for tmp file creation */ 
   srand ((unsigned int) time (NULL));
@@ -912,7 +914,7 @@ int main (int argc, char **argv)
             mutt_endwin (NULL);
           perror (tempfile);
           fclose (fin);
-          mem_free (&tempfile);
+          p_delete(&tempfile);
           exit (1);
         }
         if (fin)
@@ -925,7 +927,7 @@ int main (int argc, char **argv)
       }
     }
 
-    mem_free (&bodytext);
+    p_delete(&bodytext);
 
     if (attach) {
       LIST *t = attach;
@@ -1027,7 +1029,7 @@ int main (int argc, char **argv)
       if (option (OPTXTERMSETTITLES))
         mutt_xterm_set_title (NONULL (XtermLeave));
       if (Context)
-        mem_free (&Context);
+        p_delete(&Context);
     }
     mutt_endwin (Errorbuf);
   }