#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "enter.h"
#include "account.h"
#include "url.h"
-#include "lib/intl.h"
#include "lib/str.h"
/* mutt_account_match: compare account info (host/port/user/login) */
#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"
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "ascii.h"
#include "mx.h"
#include "mutt_crypt.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include "lib/debug.h"
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "enter.h"
#endif
#include "sidebar.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include "lib/list.h"
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "buffy.h"
#include "imap.h"
#endif
-#include "lib/intl.h"
#include <string.h>
#include <sys/stat.h>
#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
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "buffer.h"
#include "mutt_curses.h"
#include "mapping.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include "lib/debug.h"
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "enter.h"
#include "buffy.h"
#endif
-#include "lib/intl.h"
#include "lib/str.h"
#include "lib/debug.h"
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "enter.h"
#include "nntp.h"
#endif
-#include "lib/intl.h"
#include "lib/str.h"
#include <errno.h>
*/
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "mbox.h"
#include "mutt_curses.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include "lib/debug.h"
#ifdef CRYPT_BACKEND_GPGME
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "mutt_crypt.h"
#include "recvattach.h"
#include "sort.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include "lib/debug.h"
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "ascii.h"
#include "mutt_crypt.h"
#include "pgp.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include <sys/wait.h>
# include "config.h"
#endif
+#include <lib-lib/macros.h>
+
#include "mutt.h"
#include "mutt_crypt.h"
-#include "lib/intl.h"
#include "crypt-mod.h"
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "enter.h"
#include "pager.h"
#include "mbyte.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include "lib/debug.h"
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "mutt_curses.h"
#include "mutt_sasl.h"
#endif
-#include "lib/intl.h"
#include "lib/str.h"
#include "lib/debug.h"
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "ascii.h"
#include "mutt_curses.h"
#include "mutt_idna.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include <stdio.h>
# 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>
# include "config.h"
#endif
+#include <lib-lib/macros.h>
+
#include "mutt.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "imap_private.h"
#endif
-#include "lib/intl.h"
void _mutt_set_flag (CONTEXT * ctx, HEADER * h, int flag, int bf, int upd_ctx)
{
#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"
#include <sys/stat.h>
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "ascii.h"
#include "attach.h"
#include "lib.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include "lib/debug.h"
# 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>
# include "config.h"
#endif
-#include "lib/intl.h"
+#include <lib-lib/macros.h>
#include "lib/str.h"
#include "mutt.h"
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "buffer.h"
#include "compress.h"
#endif
-#include "lib/intl.h"
#include "lib/str.h"
#include "lib/rx.h"
#include <lib-lib/mem.h>
-#include "lib/intl.h"
+#include <lib-lib/macros.h>
#include "lib/debug.h"
#include "mutt.h"
#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. */
#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 */
#include "imap_private.h"
#include "auth.h"
-#include "lib/intl.h"
+#include <lib-lib/macros.h>
#include "lib/debug.h"
#include <netinet/in.h>
# include "config.h"
#endif
-#include "lib/intl.h"
+#include <lib-lib/macros.h>
#include "lib/debug.h"
#include "mutt.h"
#include "imap_private.h"
#include "auth.h"
-#include "lib/intl.h"
+#include <lib-lib/macros.h>
#include "lib/debug.h"
#include <sasl/sasl.h>
#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"
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
-#include "lib/intl.h"
#include "lib/debug.h"
#include "mutt.h"
#endif
#include "buffy.h"
-#include "lib/intl.h"
+#include <lib-lib/macros.h>
#include "lib/str.h"
#include "lib/debug.h"
#include "pgp.h"
#endif
-#include "lib/intl.h"
+#include <lib-lib/macros.h>
#include "lib/str.h"
#include "lib/debug.h"
#include "imap_private.h"
#include "mutt_ssl.h"
-#include "lib/intl.h"
+#include <lib-lib/macros.h>
#include "lib/debug.h"
#include <stdlib.h>
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "buffer.h"
#include "mx.h"
#include "init.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include "lib/rx.h"
#include "lib/list.h"
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "buffer.h"
#include "mapping.h"
#include "mutt_crypt.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include <stdlib.h>
--- /dev/null
+#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 */
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
#include "exit.h"
#include "str.h"
-#include "intl.h"
+#include <lib-lib/macros.h>
/* XXX remove after modularization*/
/*extern void mutt_endwin (void*);*/
+++ /dev/null
-#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 */
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "mutt_curses.h"
#include "mutt_idna.h"
#include "xterm.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include "lib/debug.h"
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "mx.h"
#include "compress.h"
#endif
-#include "lib/intl.h"
#include "lib/str.h"
#include "lib/debug.h"
# 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>
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "enter.h"
#include "imap.h"
#endif
-#include "lib/intl.h"
#include "lib/str.h"
#include <string.h>
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "mx.h"
#include "thread.h"
#include "hcache.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include "lib/debug.h"
#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"
#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))
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "globals.h"
#include "mutt_idna.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include "lib/debug.h"
#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"
#include "mutt_curses.h"
#include "mutt_ssl.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include "lib/debug.h"
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "mutt_socket.h"
#include "mutt_ssl.h"
#include "lib/str.h"
-#include "lib/intl.h"
#include "lib/rx.h"
typedef struct _tlssockdata {
#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>
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "ascii.h"
#include "mutt_crypt.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include "lib/debug.h"
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "buffy.h"
#include "mutt_crypt.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include "lib/list.h"
#include "lib/debug.h"
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "mutt_curses.h"
#include "rfc2047.h"
#include "lib/str.h"
-#include "lib/intl.h"
#include "lib/debug.h"
#include <unistd.h>
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "mutt_curses.h"
#include "mutt_crypt.h"
#include "lib/str.h"
-#include "lib/intl.h"
#include "lib/debug.h"
#include <unistd.h>
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "enter.h"
#include "mutt_crypt.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include "lib/rx.h"
#include "lib/debug.h"
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "buffer.h"
#include "mutt_crypt.h"
#include "url.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include "lib/rx.h"
#include "lib/debug.h"
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "buffer.h"
#include "copy.h"
#include "mime.h"
-#include "lib/intl.h"
#include "lib/str.h"
#ifdef USE_IMAP
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "enter.h"
#include "copy.h"
#include "attach.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include "lib/debug.h"
#include <time.h>
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "mutt_curses.h"
#include "pgp.h"
#include "rfc822.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include "lib/debug.h"
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "enter.h"
#include "pager.h"
#include "sort.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include "lib/debug.h"
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "mx.h"
#include "mutt_curses.h"
#include "lib/str.h"
-#include "lib/intl.h"
#include "lib/debug.h"
#include <string.h>
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "ascii.h"
#include "md5.h"
#include "pop.h"
-#include "lib/intl.h"
#include "lib/debug.h"
#include <string.h>
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "ascii.h"
# include "mutt_ssl.h"
#endif
-#include "lib/intl.h"
#include "lib/debug.h"
#include "lib/str.h"
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "ascii.h"
#endif
#include "mutt_crypt.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include "lib/debug.h"
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "mutt_menu.h"
#include "mapping.h"
#include "sort.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include "lib/debug.h"
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "ascii.h"
#include "copy.h"
#include "mutt_crypt.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include <ctype.h>
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "enter.h"
#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
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "recvattach.h"
#include "remailer.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include "lib/rx.h"
#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"
#include <sys/stat.h>
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "mutt_curses.h"
#include "state.h"
#include "lib.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include "lib/debug.h"
#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 \
#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>
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "enter.h"
#include "url.h"
#include "attach.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include "lib/debug.h"
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "ascii.h"
#include "mutt_idna.h"
#include "lib/str.h"
-#include "lib/intl.h"
#include "lib/debug.h"
#include <string.h>
*/
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "mutt_menu.h"
#include "keymap.h"
#include "lib/str.h"
-#include "lib/intl.h"
#include <libgen.h>
#include <ctype.h>
# 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>
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "enter.h"
#include "mime.h"
#include "copy.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include "lib/debug.h"
# 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>
#endif
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "mutt_menu.h"
#include "mx.h"
#include "buffy.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include <string.h>
#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>