move intl.h into lib-lib/macros.h

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/account.c b/account.c
index 406d492..dc877e7 100644 (file)
--- a/account.c
+++ b/account.c
@@ -14,6 +14,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "enter.h"
@@ -21,7 +22,6 @@
 #include "account.h"
 #include "url.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 
 /* mutt_account_match: compare account info (host/port/user/login) */

diff --git a/alias.c b/alias.c
index 48e76c5..222a01c 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -15,8 +15,8 @@
 #include <ctype.h>
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/rx.h"
 #include "lib/debug.h"

diff --git a/attach.c b/attach.c
index dfdab79..6c7a9aa 100644 (file)
--- a/attach.c
+++ b/attach.c
@@ -13,6 +13,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "ascii.h"
@@ -28,7 +29,6 @@
 #include "mx.h"
 #include "mutt_crypt.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/debug.h"
 

diff --git a/browser.c b/browser.c
index 6a9e6ec..57cdbb1 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -12,6 +12,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "enter.h"
@@ -33,7 +34,6 @@
 #endif
 #include "sidebar.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/list.h"
 

diff --git a/buffy.c b/buffy.c
index da37268..f6b2d4b 100644 (file)
--- a/buffy.c
+++ b/buffy.c
@@ -15,6 +15,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "buffy.h"
@@ -29,7 +30,6 @@
 #include "imap.h"
 #endif
 
-#include "lib/intl.h"
 
 #include <string.h>
 #include <sys/stat.h>

diff --git a/charset.c b/charset.c
index 8f5bb08..35d71b9 100644 (file)
--- a/charset.c
+++ b/charset.c
@@ -23,12 +23,12 @@
 #include <errno.h>
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "charset.h"
 #include "ascii.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 
 #ifndef EILSEQ

diff --git a/color.c b/color.c
index 1c60c77..3bee605 100644 (file)
--- a/color.c
+++ b/color.c
@@ -12,6 +12,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "buffer.h"
@@ -19,7 +20,6 @@
 #include "mutt_curses.h"
 #include "mapping.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/debug.h"
 

diff --git a/commands.c b/commands.c
index a6a92e8..de56182 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -13,6 +13,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "enter.h"
@@ -40,7 +41,6 @@
 #include "buffy.h"
 #endif
 
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/debug.h"
 

diff --git a/compose.c b/compose.c
index b46050e..f057003 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -16,6 +16,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "enter.h"
@@ -41,7 +42,6 @@
 #include "nntp.h"
 #endif
 
-#include "lib/intl.h"
 #include "lib/str.h"
 
 #include <errno.h>

diff --git a/compress.c b/compress.c
index b9e50ed..1dea354 100644 (file)
--- a/compress.c
+++ b/compress.c
@@ -8,6 +8,7 @@
  */
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 
@@ -17,7 +18,6 @@
 #include "mbox.h"
 #include "mutt_curses.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/debug.h"
 

diff --git a/crypt-gpgme.c b/crypt-gpgme.c
index 8bb7866..5879e59 100644 (file)
--- a/crypt-gpgme.c
+++ b/crypt-gpgme.c
@@ -19,6 +19,7 @@
 #ifdef CRYPT_BACKEND_GPGME
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "mutt_crypt.h"
@@ -33,7 +34,6 @@
 #include "recvattach.h"
 #include "sort.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/debug.h"
 

diff --git a/crypt.c b/crypt.c
index e5019ec..1512286 100644 (file)
--- a/crypt.c
+++ b/crypt.c
@@ -17,6 +17,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "ascii.h"
@@ -27,7 +28,6 @@
 #include "mutt_crypt.h"
 #include "pgp.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 
 #include <sys/wait.h>

diff --git a/cryptglue.c b/cryptglue.c
index d73ddcd..dc82b4a 100644 (file)
--- a/cryptglue.c
+++ b/cryptglue.c
@@ -23,10 +23,11 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/macros.h>
+
 #include "mutt.h"
 #include "mutt_crypt.h"
 
-#include "lib/intl.h"
 
 #include "crypt-mod.h"
 

diff --git a/curs_lib.c b/curs_lib.c
index a5b3a22..ddac70b 100644 (file)
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -16,6 +16,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "enter.h"
@@ -24,7 +25,6 @@
 #include "pager.h"
 #include "mbyte.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/debug.h"
 

diff --git a/curs_main.c b/curs_main.c
index 1217c5e..d367b39 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -15,6 +15,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "mutt_curses.h"
@@ -47,7 +48,6 @@
 #include "mutt_sasl.h"
 #endif
 
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/debug.h"
 

diff --git a/edit.c b/edit.c
index 42a3bcf..f5f93ac 100644 (file)
--- a/edit.c
+++ b/edit.c
@@ -14,6 +14,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "ascii.h"
@@ -21,7 +22,6 @@
 #include "mutt_curses.h"
 #include "mutt_idna.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 
 #include <stdio.h>

diff --git a/editmsg.c b/editmsg.c
index 529838c..3e2bd0f 100644 (file)
--- a/editmsg.c
+++ b/editmsg.c
@@ -13,11 +13,12 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/macros.h>
+
 #include "mutt.h"
 #include "copy.h"
 #include "mx.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 
 #include <sys/stat.h>

diff --git a/flags.c b/flags.c
index fd3333f..37dca38 100644 (file)
--- a/flags.c
+++ b/flags.c
@@ -11,6 +11,8 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/macros.h>
+
 #include "mutt.h"
 #include "mutt_curses.h"
 #include "mutt_menu.h"
@@ -22,7 +24,6 @@
 #include "imap_private.h"
 #endif
 
-#include "lib/intl.h"
 
 void _mutt_set_flag (CONTEXT * ctx, HEADER * h, int flag, int bf, int upd_ctx)
 {

diff --git a/from.c b/from.c
index cc61283..f1b47cb 100644 (file)
--- a/from.c
+++ b/from.c
@@ -12,10 +12,10 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/debug.h"
 

diff --git a/handler.c b/handler.c
index a2481ac..b3d65e5 100644 (file)
--- a/handler.c
+++ b/handler.c
@@ -19,6 +19,7 @@
 #include <sys/stat.h>
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "ascii.h"
@@ -36,7 +37,6 @@
 #include "attach.h"
 #include "lib.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/debug.h"
 

diff --git a/headers.c b/headers.c
index e5a1540..3cedeb6 100644 (file)
--- a/headers.c
+++ b/headers.c
@@ -11,12 +11,13 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/macros.h>
+
 #include "mutt.h"
 #include "ascii.h"
 #include "mutt_crypt.h"
 #include "mutt_idna.h"
 
-#include "lib/intl.h"
 #include "lib/debug.h"
 
 #include <sys/stat.h>

diff --git a/help.c b/help.c
index c0bf22c..2f13577 100644 (file)
--- a/help.c
+++ b/help.c
@@ -13,7 +13,7 @@
 # include "config.h"
 #endif
 
-#include "lib/intl.h"
+#include <lib-lib/macros.h>
 #include "lib/str.h"
 
 #include "mutt.h"

diff --git a/hook.c b/hook.c
index a3a25e3..3eb5cd1 100644 (file)
--- a/hook.c
+++ b/hook.c
@@ -12,6 +12,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "buffer.h"
@@ -22,7 +23,6 @@
 #include "compress.h"
 #endif
 
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/rx.h"
 

diff --git a/imap/auth.c b/imap/auth.c
index f97e5a9..2e6b8ca 100644 (file)
--- a/imap/auth.c
+++ b/imap/auth.c
@@ -17,7 +17,7 @@
 
 #include <lib-lib/mem.h>
 
-#include "lib/intl.h"
+#include <lib-lib/macros.h>
 #include "lib/debug.h"
 
 #include "mutt.h"

diff --git a/imap/auth_anon.c b/imap/auth_anon.c
index fc6d401..2c5b3fa 100644 (file)
--- a/imap/auth_anon.c
+++ b/imap/auth_anon.c
@@ -17,7 +17,7 @@
 #include "imap_private.h"
 #include "auth.h"
 
-#include "lib/intl.h"
+#include <lib-lib/macros.h>
 #include "lib/debug.h"
 
 /* this is basically a stripped-down version of the cram-md5 method. */

diff --git a/imap/auth_cram.c b/imap/auth_cram.c
index 4a54f48..1eda8d9 100644 (file)
--- a/imap/auth_cram.c
+++ b/imap/auth_cram.c
@@ -21,7 +21,7 @@
 #define MD5_BLOCK_LEN 64
 #define MD5_DIGEST_LEN 16
 
-#include "lib/intl.h"
+#include <lib-lib/macros.h>
 #include "lib/debug.h"
 
 /* forward declarations */

diff --git a/imap/auth_gss.c b/imap/auth_gss.c
index cd4b278..fa51467 100644 (file)
--- a/imap/auth_gss.c
+++ b/imap/auth_gss.c
@@ -17,7 +17,7 @@
 #include "imap_private.h"
 #include "auth.h"
 
-#include "lib/intl.h"
+#include <lib-lib/macros.h>
 #include "lib/debug.h"
 
 #include <netinet/in.h>

diff --git a/imap/auth_login.c b/imap/auth_login.c
index 3216c3b..27e2156 100644 (file)
--- a/imap/auth_login.c
+++ b/imap/auth_login.c
@@ -13,7 +13,7 @@
 # include "config.h"
 #endif
 
-#include "lib/intl.h"
+#include <lib-lib/macros.h>
 #include "lib/debug.h"
 
 #include "mutt.h"

diff --git a/imap/auth_sasl.c b/imap/auth_sasl.c
index 171aadd..436b331 100644 (file)
--- a/imap/auth_sasl.c
+++ b/imap/auth_sasl.c
@@ -21,7 +21,7 @@
 #include "imap_private.h"
 #include "auth.h"
 
-#include "lib/intl.h"
+#include <lib-lib/macros.h>
 #include "lib/debug.h"
 
 #include <sasl/sasl.h>

diff --git a/imap/browse.c b/imap/browse.c
index 52dcc79..39bf980 100644 (file)
--- a/imap/browse.c
+++ b/imap/browse.c
@@ -18,9 +18,9 @@
 #include <ctype.h>
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "lib/str.h"
-#include "lib/intl.h"
 #include "lib/debug.h"
 
 #include "mutt.h"

diff --git a/imap/command.c b/imap/command.c
index 570e063..02d49d7 100644 (file)
--- a/imap/command.c
+++ b/imap/command.c
@@ -17,8 +17,8 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
-#include "lib/intl.h"
 #include "lib/debug.h"
 
 #include "mutt.h"

diff --git a/imap/imap.c b/imap/imap.c
index 17e94a2..7ead95a 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -31,7 +31,7 @@
 #endif
 #include "buffy.h"
 
-#include "lib/intl.h"
+#include <lib-lib/macros.h>
 #include "lib/str.h"
 #include "lib/debug.h"
 

diff --git a/imap/message.c b/imap/message.c
index 7157df6..660f954 100644 (file)
--- a/imap/message.c
+++ b/imap/message.c
@@ -32,7 +32,7 @@
 #include "pgp.h"
 #endif
 
-#include "lib/intl.h"
+#include <lib-lib/macros.h>
 #include "lib/str.h"
 #include "lib/debug.h"
 

diff --git a/imap/util.c b/imap/util.c
index 9cf7043..1f02969 100644 (file)
--- a/imap/util.c
+++ b/imap/util.c
@@ -22,7 +22,7 @@
 #include "imap_private.h"
 #include "mutt_ssl.h"
 
-#include "lib/intl.h"
+#include <lib-lib/macros.h>
 #include "lib/debug.h"
 
 #include <stdlib.h>

diff --git a/init.c b/init.c
index 3af5cd5..550fcfd 100644 (file)
--- a/init.c
+++ b/init.c
@@ -15,6 +15,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "buffer.h"
@@ -40,7 +41,6 @@
 #include "mx.h"
 #include "init.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/rx.h"
 #include "lib/list.h"

diff --git a/keymap.c b/keymap.c
index 73234e1..707a8cb 100644 (file)
--- a/keymap.c
+++ b/keymap.c
@@ -12,6 +12,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "buffer.h"
@@ -22,7 +23,6 @@
 #include "mapping.h"
 #include "mutt_crypt.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 
 #include <stdlib.h>

diff --git a/lib-lib/macros.h b/lib-lib/macros.h
new file mode 100644 (file)
index 0000000..e8e6a61
--- /dev/null
+++ b/lib-lib/macros.h
@@ -0,0 +1,25 @@
+#ifndef MUTT_LIB_LIB_MACROS_H
+#define MUTT_LIB_LIB_MACROS_H
+
+/*
+ * config.h must be included by source file!
+ */
+
+#ifdef _
+#  undef _
+#endif
+
+#ifdef ENABLE_NLS
+#  include <libintl.h>
+#define _(a)       (gettext(a))
+#  ifdef gettext_noop
+#    define N_(a)  gettext_noop(a)
+#  else
+#    define N_(a)  (a)
+#  endif
+#else
+#  define _(a)     (a)
+#  define N_(a)    (a)
+#endif
+
+#endif /* MUTT_LIB_LIB_MACROS_H */

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 9d687ab..2d75bb3 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -4,12 +4,10 @@ AR=@AR@
 
 AUTOMAKE_OPTIONS = foreign
 
-INCLUDES = -I$(top_srcdir) -I../intl
-
 noinst_LIBRARIES = libsane.a
-noinst_HEADERS = str.h exit.h intl.h list.h rx.h debug.h
+noinst_HEADERS = str.h exit.h list.h rx.h debug.h
 
 libsane_a_SOURCES = exit.c str.c list.c rx.h debug.h \
-                   exit.h str.h list.h rx.c debug.c intl.h
+                   exit.h str.h list.h rx.c debug.c
 
 -include ../cflags.mk

diff --git a/lib/exit.c b/lib/exit.c
index 13be19d..be9ecad 100644 (file)
--- a/lib/exit.c
+++ b/lib/exit.c
@@ -4,7 +4,7 @@
 
 #include "exit.h"
 #include "str.h"
-#include "intl.h"
+#include <lib-lib/macros.h>
 
 /* XXX remove after modularization*/
 /*extern void mutt_endwin (void*);*/

diff --git a/lib/intl.h b/lib/intl.h
deleted file mode 100644 (file)
index b124bef..0000000
--- a/lib/intl.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef _LIB_INTL_H
-#define _LIB_INTL_H
-
-/*
- * config.h must be included by source file!
- */
-
-# ifdef ENABLE_NLS
-#  include <libintl.h>
-# define _(a) (gettext (a))
-#  ifdef gettext_noop
-#   define N_(a) gettext_noop (a)
-#  else
-#   define N_(a) (a)
-#  endif
-# else
-#  define _(a) (a)
-#  define N_(a) a
-# endif
-
-#endif /* !_LIB_INTL_H */

diff --git a/main.c b/main.c
index d0c4b0c..9af3581 100644 (file)
--- a/main.c
+++ b/main.c
@@ -20,6 +20,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "mutt_curses.h"
@@ -29,7 +30,6 @@
 #include "mutt_idna.h"
 #include "xterm.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/debug.h"
 

diff --git a/mbox.c b/mbox.c
index 4a12c19..cc3af4c 100644 (file)
--- a/mbox.c
+++ b/mbox.c
@@ -14,6 +14,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "mx.h"
@@ -27,7 +28,6 @@
 #include "compress.h"
 #endif
 
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/debug.h"
 

diff --git a/mbyte.c b/mbyte.c
index c9f3540..ce26508 100644 (file)
--- a/mbyte.c
+++ b/mbyte.c
@@ -15,11 +15,12 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/macros.h>
+
 #include "mutt.h"
 #include "mbyte.h"
 #include "charset.h"
 
-#include "lib/intl.h"
 
 #include <errno.h>
 

diff --git a/menu.c b/menu.c
index 1431797..981382b 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -12,6 +12,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "enter.h"
@@ -24,7 +25,6 @@
 #include "imap.h"
 #endif
 
-#include "lib/intl.h"
 #include "lib/str.h"
 
 #include <string.h>

diff --git a/mh.c b/mh.c
index 8c9bbc7..905f6cc 100644 (file)
--- a/mh.c
+++ b/mh.c
@@ -18,6 +18,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "mx.h"
@@ -29,7 +30,6 @@
 #include "thread.h"
 #include "hcache.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/debug.h"
 

diff --git a/mutt_idna.c b/mutt_idna.c
index 96d33d2..14d8f45 100644 (file)
--- a/mutt_idna.c
+++ b/mutt_idna.c
@@ -12,13 +12,13 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "ascii.h"
 #include "charset.h"
 #include "mutt_idna.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/debug.h"
 

diff --git a/mutt_libesmtp.c b/mutt_libesmtp.c
index 0a6547f..9b45062 100644 (file)
--- a/mutt_libesmtp.c
+++ b/mutt_libesmtp.c
@@ -15,12 +15,12 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "ascii.h"
 #include "enter.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 
 #if defined (USE_SSL) || (defined (USE_GNUTLS) && defined (HAVE_GNUTLS_OPENSSL_H))

diff --git a/mutt_socket.c b/mutt_socket.c
index 6bac9d4..1a02f24 100644 (file)
--- a/mutt_socket.c
+++ b/mutt_socket.c
@@ -14,6 +14,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "globals.h"
@@ -25,7 +26,6 @@
 
 #include "mutt_idna.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/debug.h"
 

diff --git a/mutt_ssl.c b/mutt_ssl.c
index 37e46b6..091eb84 100644 (file)
--- a/mutt_ssl.c
+++ b/mutt_ssl.c
@@ -18,11 +18,10 @@
 #include <openssl/err.h>
 #include <openssl/rand.h>
 
-#undef _
-
 #include <string.h>
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "mutt_socket.h"
@@ -30,7 +29,6 @@
 #include "mutt_curses.h"
 #include "mutt_ssl.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/debug.h"
 

diff --git a/mutt_ssl_gnutls.c b/mutt_ssl_gnutls.c
index 134828b..f6d8b2d 100644 (file)
--- a/mutt_ssl_gnutls.c
+++ b/mutt_ssl_gnutls.c
@@ -21,6 +21,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "mutt_socket.h"
@@ -29,7 +30,6 @@
 #include "mutt_ssl.h"
 
 #include "lib/str.h"
-#include "lib/intl.h"
 #include "lib/rx.h"
 
 typedef struct _tlssockdata {

diff --git a/mutt_tunnel.c b/mutt_tunnel.c
index e26261a..13a08ee 100644 (file)
--- a/mutt_tunnel.c
+++ b/mutt_tunnel.c
@@ -13,12 +13,12 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "mutt_socket.h"
 #include "mutt_tunnel.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 
 #include <netinet/in.h>

diff --git a/muttlib.c b/muttlib.c
index bb6ac73..bb48e07 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -13,6 +13,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "ascii.h"
@@ -34,7 +35,6 @@
 
 #include "mutt_crypt.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/debug.h"
 

diff --git a/mx.c b/mx.c
index 9400483..bbaf57d 100644 (file)
--- a/mx.c
+++ b/mx.c
@@ -13,6 +13,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "buffy.h"
@@ -53,7 +54,6 @@
 
 #include "mutt_crypt.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/list.h"
 #include "lib/debug.h"

diff --git a/nntp/newsrc.c b/nntp/newsrc.c
index 8f0e514..d3d9a6c 100644 (file)
--- a/nntp/newsrc.c
+++ b/nntp/newsrc.c
@@ -14,6 +14,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "mutt_curses.h"
@@ -26,7 +27,6 @@
 #include "rfc2047.h"
 
 #include "lib/str.h"
-#include "lib/intl.h"
 #include "lib/debug.h"
 
 #include <unistd.h>

diff --git a/nntp/nntp.c b/nntp/nntp.c
index 34c035f..4cc318d 100644 (file)
--- a/nntp/nntp.c
+++ b/nntp/nntp.c
@@ -14,6 +14,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "mutt_curses.h"
@@ -30,7 +31,6 @@
 #include "mutt_crypt.h"
 
 #include "lib/str.h"
-#include "lib/intl.h"
 #include "lib/debug.h"
 
 #include <unistd.h>

diff --git a/pager.c b/pager.c
index bd1b2a8..8b98c73 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -16,6 +16,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "enter.h"
@@ -39,7 +40,6 @@
 
 #include "mutt_crypt.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/rx.h"
 #include "lib/debug.h"

diff --git a/parse.c b/parse.c
index b429117..acf362d 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -12,6 +12,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "buffer.h"
@@ -25,7 +26,6 @@
 #include "mutt_crypt.h"
 #include "url.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/rx.h"
 #include "lib/debug.h"

diff --git a/pattern.c b/pattern.c
index eb371fc..585e130 100644 (file)
--- a/pattern.c
+++ b/pattern.c
@@ -12,6 +12,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "buffer.h"
@@ -24,7 +25,6 @@
 #include "copy.h"
 #include "mime.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 
 #ifdef USE_IMAP

diff --git a/pgp.c b/pgp.c
index 4adb5d0..0a2ed87 100644 (file)
--- a/pgp.c
+++ b/pgp.c
@@ -22,6 +22,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "enter.h"
@@ -33,7 +34,6 @@
 #include "copy.h"
 #include "attach.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/debug.h"
 

diff --git a/pgpinvoke.c b/pgpinvoke.c
index 0cef580..04096fd 100644 (file)
--- a/pgpinvoke.c
+++ b/pgpinvoke.c
@@ -26,6 +26,7 @@
 #include <time.h>
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "mutt_curses.h"
@@ -33,7 +34,6 @@
 #include "pgp.h"
 #include "rfc822.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/debug.h"
 

diff --git a/pgpkey.c b/pgpkey.c
index 2ac3ce1..009955d 100644 (file)
--- a/pgpkey.c
+++ b/pgpkey.c
@@ -13,6 +13,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "enter.h"
@@ -25,7 +26,6 @@
 #include "pager.h"
 #include "sort.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/debug.h"
 

diff --git a/pop/pop.c b/pop/pop.c
index 465a770..c24ac1c 100644 (file)
--- a/pop/pop.c
+++ b/pop/pop.c
@@ -12,6 +12,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "mx.h"
@@ -20,7 +21,6 @@
 #include "mutt_curses.h"
 
 #include "lib/str.h"
-#include "lib/intl.h"
 #include "lib/debug.h"
 
 #include <string.h>

diff --git a/pop/pop_auth.c b/pop/pop_auth.c
index 08d3183..2c2cec0 100644 (file)
--- a/pop/pop_auth.c
+++ b/pop/pop_auth.c
@@ -12,6 +12,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "ascii.h"
@@ -19,7 +20,6 @@
 #include "md5.h"
 #include "pop.h"
 
-#include "lib/intl.h"
 #include "lib/debug.h"
 
 #include <string.h>

diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index 8359cac..565ae58 100644 (file)
--- a/pop/pop_lib.c
+++ b/pop/pop_lib.c
@@ -12,6 +12,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "ascii.h"
@@ -22,7 +23,6 @@
 # include "mutt_ssl.h"
 #endif
 
-#include "lib/intl.h"
 #include "lib/debug.h"
 #include "lib/str.h"
 

diff --git a/postpone.c b/postpone.c
index f4f5aa6..d19bacc 100644 (file)
--- a/postpone.c
+++ b/postpone.c
@@ -13,6 +13,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "ascii.h"
@@ -31,7 +32,6 @@
 #endif
 #include "mutt_crypt.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/debug.h"
 

diff --git a/query.c b/query.c
index 58ece1f..f7a7894 100644 (file)
--- a/query.c
+++ b/query.c
@@ -12,6 +12,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "mutt_menu.h"
@@ -19,7 +20,6 @@
 #include "mapping.h"
 #include "sort.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/debug.h"
 

diff --git a/recvattach.c b/recvattach.c
index 6277705..a0afdea 100644 (file)
--- a/recvattach.c
+++ b/recvattach.c
@@ -13,6 +13,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "ascii.h"
@@ -29,7 +30,6 @@
 #include "copy.h"
 #include "mutt_crypt.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 
 #include <ctype.h>

diff --git a/recvcmd.c b/recvcmd.c
index 5606c28..5a5e1c4 100644 (file)
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -12,6 +12,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "enter.h"
@@ -28,7 +29,6 @@
 #include "copy.h"
 #include "mutt_idna.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 
 /* some helper functions to verify that we are exclusively operating

diff --git a/remailer.c b/remailer.c
index b542209..8b1a302 100644 (file)
--- a/remailer.c
+++ b/remailer.c
@@ -16,6 +16,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "recvattach.h"
@@ -25,7 +26,6 @@
 
 #include "remailer.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/rx.h"
 

diff --git a/rfc1524.c b/rfc1524.c
index 5b70e5a..d4f5ec5 100644 (file)
--- a/rfc1524.c
+++ b/rfc1524.c
@@ -22,13 +22,13 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "ascii.h"
 #include "rfc1524.h"
 #include "attach.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/debug.h"
 

diff --git a/rfc3676.c b/rfc3676.c
index cc14441..bd4bd03 100644 (file)
--- a/rfc3676.c
+++ b/rfc3676.c
@@ -21,6 +21,7 @@
 #include <sys/stat.h>
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "mutt_curses.h"
@@ -29,7 +30,6 @@
 #include "state.h"
 #include "lib.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/debug.h"
 

diff --git a/rfc822.c b/rfc822.c
index 557f854..d7946cd 100644 (file)
--- a/rfc822.c
+++ b/rfc822.c
@@ -16,12 +16,12 @@
 #include <stdlib.h>
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "ascii.h"
 #include "mutt_idna.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 
 #define terminate_string(a, b, c) do { if ((b) < (c)) a[(b)] = 0; else \

diff --git a/score.c b/score.c
index 88c42c3..7959d4c 100644 (file)
--- a/score.c
+++ b/score.c
@@ -12,13 +12,12 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "sort.h"
 #include "buffer.h"
 
-#include "lib/intl.h"
-
 #include <string.h>
 #include <stdlib.h>
 

diff --git a/send.c b/send.c
index 9e40423..ea02d98 100644 (file)
--- a/send.c
+++ b/send.c
@@ -12,6 +12,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "enter.h"
@@ -28,7 +29,6 @@
 #include "url.h"
 #include "attach.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/debug.h"
 

diff --git a/sendlib.c b/sendlib.c
index f17b0d5..48f95b1 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -14,6 +14,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "ascii.h"
@@ -31,7 +32,6 @@
 #include "mutt_idna.h"
 
 #include "lib/str.h"
-#include "lib/intl.h"
 #include "lib/debug.h"
 
 #include <string.h>

diff --git a/sidebar.c b/sidebar.c
index 378c163..6948607 100644 (file)
--- a/sidebar.c
+++ b/sidebar.c
@@ -13,6 +13,7 @@
  */
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "mutt_menu.h"
@@ -22,7 +23,6 @@
 #include "keymap.h"
 
 #include "lib/str.h"
-#include "lib/intl.h"
 
 #include <libgen.h>
 #include <ctype.h>

diff --git a/signal.c b/signal.c
index fe9d7f3..7abc3ec 100644 (file)
--- a/signal.c
+++ b/signal.c
@@ -11,11 +11,11 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/macros.h>
+
 #include "mutt.h"
 #include "mutt_curses.h"
 
-#include "lib/intl.h"
-
 #include <signal.h>
 #include <string.h>
 #include <sys/wait.h>

diff --git a/smime.c b/smime.c
index 9860826..88989f5 100644 (file)
--- a/smime.c
+++ b/smime.c
@@ -14,6 +14,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "enter.h"
@@ -24,7 +25,6 @@
 #include "mime.h"
 #include "copy.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/debug.h"
 

diff --git a/sort.c b/sort.c
index 138d13e..8a5957f 100644 (file)
--- a/sort.c
+++ b/sort.c
@@ -11,13 +11,14 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/macros.h>
+
 #include "mutt.h"
 #include "sort.h"
 #include "thread.h"
 #include "mutt_idna.h"
 
 #include "lib/str.h"
-#include "lib/intl.h"
 
 #include <stdlib.h>
 #include <string.h>

diff --git a/status.c b/status.c
index cc3d0d3..2a925b6 100644 (file)
--- a/status.c
+++ b/status.c
@@ -12,6 +12,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "mutt_menu.h"
@@ -21,7 +22,6 @@
 #include "mx.h"
 #include "buffy.h"
 
-#include "lib/intl.h"
 #include "lib/str.h"
 
 #include <string.h>

diff --git a/thread.c b/thread.c
index 965c897..c3b78de 100644 (file)
--- a/thread.c
+++ b/thread.c
@@ -12,12 +12,12 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "sort.h"
 #include "thread.h"
 
-#include "lib/intl.h"
 
 #include <string.h>
 #include <ctype.h>