rename lib to mutt

diff --git a/.clang-format b/.clang-format
index 45aef4e950b6c37daf352feadece0ff7a49783b3..4e8568232ec42dfb36aafb9157bf1820fca7d202 100644 (file)
--- a/.clang-format
+++ b/.clang-format
@@ -16,7 +16,7 @@ IncludeCategories:
     Priority:   -7
   - Regex:      '".*_private\.h"'
     Priority:   -6
-  - Regex:      '"lib/.*\.h"'
+  - Regex:      '"mutt/.*\.h"'
     Priority:   -4
   - Regex:      '"conn/.*\.h"'
     Priority:   -3

diff --git a/Makefile.am b/Makefile.am
index 29604c706541e4b34403b6bc81f7eaa2bfabafef..c49ec5c0fe578d168d5f0822d140416f180ce3de 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \
        --with-sasl \
        --with-tokyocabinet
 
-SUBDIRS = m4 contrib imap ncrypt lib conn
+SUBDIRS = m4 contrib imap ncrypt mutt conn
 
 if BUILD_HCACHE
 SUBDIRS += hcache
@@ -65,8 +65,8 @@ LIBIMAPDEPS = $(top_srcdir)/imap/imap.h imap/libimap.a
 LIBCONN = -Lconn -lconn
 LIBCONNDEPS = $(top_srcdir)/conn/connection.h conn/libconn.a
 
-LIBMUTT = -Llib -lmutt
-LIBMUTTDEPS = $(top_srcdir)/lib/lib.h lib/libmutt.a
+LIBMUTT = -Lmutt -lmutt
+LIBMUTTDEPS = $(top_srcdir)/mutt/mutt.h mutt/libmutt.a
 
 neomutt_LDADD = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(HCACHE_LIBS) $(NCRYPT_LIBS) \
        $(LIBIMAP) $(LIBCONN) $(LIBMUTT) $(LIBICONV) $(GPGME_LIBS) $(INTLLIBS)

diff --git a/Makefile.autosetup b/Makefile.autosetup
index 15ff61688e8ca451ce231e0212ff13988c4cfc52..5c405054649821dbb875ef5b245387ae073a0b03 100644 (file)
--- a/Makefile.autosetup
+++ b/Makefile.autosetup
@@ -90,9 +90,9 @@ ALLOBJS+=     $(NEOMUTTOBJS)
 ###############################################################################
 # libmutt
 LIBMUTT=       libmutt.a
-LIBMUTTOBJS=   lib/base64.o lib/buffer.o lib/date.o lib/debug.o lib/exit.o \
-               lib/file.o lib/hash.o lib/list.o lib/mapping.o lib/mbyte.o lib/md5.o \
-               lib/memory.o lib/message.o lib/sha1.o lib/string.o
+LIBMUTTOBJS=   mutt/base64.o mutt/buffer.o mutt/date.o mutt/debug.o mutt/exit.o \
+               mutt/file.o mutt/hash.o mutt/list.o mutt/mapping.o mutt/mbyte.o mutt/md5.o \
+               mutt/memory.o mutt/message.o mutt/sha1.o mutt/string.o
 CLEANFILES+=   $(LIBMUTT) $(LIBMUTTOBJS)
 MUTTLIBS+=     $(LIBMUTT)
 ALLOBJS+=      $(LIBMUTTOBJS)
@@ -267,14 +267,14 @@ git_ver.h: $(ALL_FILES)
        rm -f git_ver.h.tmp
 
 hcache/hcversion.h:    $(SRCDIR)/mutt.h $(SRCDIR)/address.h \
-                       $(SRCDIR)/lib/list.h $(SRCDIR)/lib/buffer.h \
+                       $(SRCDIR)/mutt/list.h $(SRCDIR)/mutt/buffer.h \
                        $(SRCDIR)/parameter.h $(SRCDIR)/body.h \
                        $(SRCDIR)/envelope.h $(SRCDIR)/header.h \
                        $(SRCDIR)/hcache/hcachever.sh \
                        $(PWD)/hcache
        ( echo '#include "config.h"'; echo '#include "mutt.h"'; \
-       echo '#include "address.h"'; echo '#include "lib/list.h"'; \
-       echo '#include "lib/buffer.h"'; echo '#include "parameter.h"'; \
+       echo '#include "address.h"'; echo '#include "mutt/list.h"'; \
+       echo '#include "mutt/buffer.h"'; echo '#include "parameter.h"'; \
        echo '#include "body.h"'; echo '#include "envelope.h"'; \
        echo '#include "header.h"';) | $(CPP) $(CFLAGS) - | \
        sh $(SRCDIR)/hcache/hcachever.sh hcache/hcversion.h

diff --git a/addrbook.c b/addrbook.c
index 186d34a7d876f34d7740154f56510797519f8622..be6e56349447bbbe097805a72f4d12b87e104f7a 100644 (file)
--- a/addrbook.c
+++ b/addrbook.c
@@ -24,7 +24,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "address.h"
 #include "alias.h"

diff --git a/alias.c b/alias.c
index 6f4a283fa3dcc52dfc9d0152eeb6edf86183f986..3e334e99c287d9a0d658548d944b8691c3ba1e0b 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -32,7 +32,7 @@
 #include <string.h>
 #include <wchar.h>
 #include <wctype.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "address.h"
 #include "alias.h"
@@ -694,4 +694,3 @@ void mutt_free_alias(struct Alias **p)
     FREE(&t);
   }
 }
-

diff --git a/attach.c b/attach.c
index ab2207bcfbfb9cb2f1b81553fc8e525ca040613d..223abd5b85961ee68037cb27268f2bb6401430e0 100644 (file)
--- a/attach.c
+++ b/attach.c
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "attach.h"
 #include "body.h"

diff --git a/bcache.c b/bcache.c
index a29c87f677636eb5ed0033a0cea25d92842563c6..0f970f717e94e4869ec905736e24f744241f6744 100644 (file)
--- a/bcache.c
+++ b/bcache.c
@@ -29,7 +29,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "bcache.h"
 #include "globals.h"
 #include "mutt_account.h"

diff --git a/body.c b/body.c
index 8e0941217abcda4e93251e296fb8f8df30dcb43d..a1e02f91a9860f7f4fa8f169ba01b01006cb493c 100644 (file)
--- a/body.c
+++ b/body.c
@@ -24,9 +24,9 @@
 #include <limits.h>
 #include <string.h>
 #include <unistd.h>
-#include "lib/debug.h"
-#include "lib/memory.h"
-#include "lib/string2.h"
+#include "mutt/debug.h"
+#include "mutt/memory.h"
+#include "mutt/string2.h"
 #include "body.h"
 #include "header.h"
 #include "mime.h"

diff --git a/browser.c b/browser.c
index 5fc79d29a719f183c43dc209171a9709a6ee32ba..d46209ee8758e2aaf08d7c21920195e7ed25be7f 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -39,7 +39,7 @@
 #include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "attach.h"

diff --git a/buffy.c b/buffy.c
index 9f10ecc1e14976b745bb6ac13c5d1d83cd310f6f..5e26c641118a3470e8b9364a0db46ea24af91e7c 100644 (file)
--- a/buffy.c
+++ b/buffy.c
@@ -29,7 +29,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <utime.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "buffy.h"
 #include "context.h"

diff --git a/charset.c b/charset.c
index 1c25af56cedb5dbd7208476568c1c006bc985359..267df735286d17ce692fd587098ab37bd6af67b2 100644 (file)
--- a/charset.c
+++ b/charset.c
@@ -27,7 +27,7 @@
 #include <limits.h>
 #include <stdio.h>
 #include <string.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "charset.h"
 #include "globals.h"

diff --git a/color.c b/color.c
index 2364f392c4eb3e55a371cb4300b8817be138911d..f4b8de56e08c3ccfe9a4242436cb6d8e071fa86f 100644 (file)
--- a/color.c
+++ b/color.c
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "context.h"
 #include "globals.h"

diff --git a/commands.c b/commands.c
index e398874e46d9bdb48e746f4ceab75c6d02db3243..e6e445d9cff28af19a23135d63411ecb18586fc0 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -34,7 +34,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "alias.h"
 #include "body.h"

diff --git a/complete.c b/complete.c
index 7bfd7fca5aa63b233169c7fba96b56c1575f4eb9..9358ee756e4e4ed555fc99cff54f13b4336a9d85 100644 (file)
--- a/complete.c
+++ b/complete.c
@@ -26,7 +26,7 @@
 #include <limits.h>
 #include <string.h>
 #include <sys/stat.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "globals.h"
 #include "options.h"
 #include "protos.h"

diff --git a/compose.c b/compose.c
index c5fbb1a86572cf11259cb26a619248362adf7d15..eca9724da689a766fcffb125857f1baf856e8c67 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -32,7 +32,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "alias.h"

diff --git a/compress.c b/compress.c
index a7fd296ed683e76354393c704a01a01e3be576cb..0e6f7b33bd3ea58c5378e031268ed690babd7015 100644 (file)
--- a/compress.c
+++ b/compress.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "compress.h"
 #include "context.h"

diff --git a/configure.ac b/configure.ac
index c59dc517a6b35453c91c878d5bc34fe388934896..e739f1f586753b84abf1a28fd2788edf2344c7e2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -947,7 +947,7 @@ if test x$full_doc != xno; then
 fi
 
 AC_CONFIG_FILES(Makefile contrib/Makefile doc/Makefile imap/Makefile
-       m4/Makefile po/Makefile.in hcache/Makefile ncrypt/Makefile lib/Makefile conn/Makefile)
+       m4/Makefile po/Makefile.in hcache/Makefile ncrypt/Makefile mutt/Makefile conn/Makefile)
 AC_OUTPUT
 
 AC_MSG_NOTICE([Summary of build options:

diff --git a/conn/connection.h b/conn/connection.h
index cfa079054e8f23e521c08e8b6a31c0c16a04bbc1..dec678c82c6ace4a46838abe4854a354d1daeb77 100644 (file)
--- a/conn/connection.h
+++ b/conn/connection.h
@@ -26,7 +26,7 @@
 
 #include <stdio.h>
 #include <time.h>
-#include "lib/queue.h"
+#include "mutt/queue.h"
 #include "account.h"
 
 #define LONG_STRING 1024

diff --git a/conn/getdomain.c b/conn/getdomain.c
index f415e997b2f81f78c688262a97b9b7f582ba8d26..593a760793651a202ddaf98645a71b030d169ba6 100644 (file)
--- a/conn/getdomain.c
+++ b/conn/getdomain.c
@@ -36,9 +36,9 @@
 #include <sys/socket.h>
 #include <time.h>
 #include <unistd.h>
-#include "lib/debug.h"
-#include "lib/memory.h"
-#include "lib/string2.h"
+#include "mutt/debug.h"
+#include "mutt/memory.h"
+#include "mutt/string2.h"
 
 /**
  * getdnsdomainname - Lookup the host's name using DNS

diff --git a/conn/sasl.c b/conn/sasl.c
index eef0afdf1ab64b60fbfab75687de38d40df7872c..f71707f7b96358edb9be13df73befde308f44783 100644 (file)
--- a/conn/sasl.c
+++ b/conn/sasl.c
@@ -53,10 +53,10 @@
 #include <string.h>
 #include <sys/socket.h>
 #include <time.h>
-#include "lib/debug.h"
-#include "lib/memory.h"
-#include "lib/message.h"
-#include "lib/string2.h"
+#include "mutt/debug.h"
+#include "mutt/memory.h"
+#include "mutt/message.h"
+#include "mutt/string2.h"
 #include "sasl.h"
 #include "account.h"
 #include "connection.h"

diff --git a/conn/sasl_plain.c b/conn/sasl_plain.c
index 2f218df72be108e9e1482347446a2e1969bcfaa0..0366e958a32902b49e2955e96ab792a7293bd1d9 100644 (file)
--- a/conn/sasl_plain.c
+++ b/conn/sasl_plain.c
@@ -32,8 +32,8 @@
 
 #include "config.h"
 #include <stdio.h>
-#include "lib/base64.h"
-#include "lib/string2.h"
+#include "mutt/base64.h"
+#include "mutt/string2.h"
 
 /**
  * mutt_sasl_plain_msg - Create an SASL command

diff --git a/conn/socket.c b/conn/socket.c
index 5846391afc0e4c47e0177c80155604d7c502175f..c1d52c11846e298397a021075f3593af71a963c2 100644 (file)
--- a/conn/socket.c
+++ b/conn/socket.c
@@ -57,10 +57,10 @@
 #include <sys/time.h>
 #include <time.h>
 #include <unistd.h>
-#include "lib/debug.h"
-#include "lib/memory.h"
-#include "lib/message.h"
-#include "lib/string2.h"
+#include "mutt/debug.h"
+#include "mutt/memory.h"
+#include "mutt/message.h"
+#include "mutt/string2.h"
 #include "account.h"
 #include "conn_globals.h"
 #include "connection.h"

diff --git a/conn/ssl.c b/conn/ssl.c
index cbeacd493380e652e2c53b7f2234ea82639e4c6a..04b0a444c6ec0b37f08a648a8ca0f60c08a4ab59 100644 (file)
--- a/conn/ssl.c
+++ b/conn/ssl.c
@@ -52,11 +52,11 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include "lib/debug.h"
-#include "lib/file.h"
-#include "lib/memory.h"
-#include "lib/message.h"
-#include "lib/string2.h"
+#include "mutt/debug.h"
+#include "mutt/file.h"
+#include "mutt/memory.h"
+#include "mutt/message.h"
+#include "mutt/string2.h"
 #include "mutt.h"
 #include "ssl.h"
 #include "account.h"

diff --git a/conn/ssl_gnutls.c b/conn/ssl_gnutls.c
index 872de9949061b857c1edd47e2c6bc729b6834454..972256e4432cebcfa1b42d95fbf23edc58b2f4b2 100644 (file)
--- a/conn/ssl_gnutls.c
+++ b/conn/ssl_gnutls.c
@@ -42,12 +42,12 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <time.h>
-#include "lib/date.h"
-#include "lib/debug.h"
-#include "lib/file.h"
-#include "lib/memory.h"
-#include "lib/message.h"
-#include "lib/string2.h"
+#include "mutt/date.h"
+#include "mutt/debug.h"
+#include "mutt/file.h"
+#include "mutt/memory.h"
+#include "mutt/message.h"
+#include "mutt/string2.h"
 #include "mutt.h"
 #include "account.h"
 #include "conn_globals.h"

diff --git a/conn/tunnel.c b/conn/tunnel.c
index 86ea547e14501b548d63fad2980f27274d70665c..e0871205ce2d48daa2b54a65f0273ec0221e4e9a 100644 (file)
--- a/conn/tunnel.c
+++ b/conn/tunnel.c
@@ -41,9 +41,9 @@
 #include <sys/wait.h>
 #include <time.h>
 #include <unistd.h>
-#include "lib/memory.h"
-#include "lib/message.h"
-#include "lib/string2.h"
+#include "mutt/memory.h"
+#include "mutt/message.h"
+#include "mutt/string2.h"
 #include "mutt.h"
 #include "tunnel.h"
 #include "account.h"

diff --git a/copy.c b/copy.c
index f4bd48b595d1be092a65ae85e39670906a7f20cc..fb422e28766b1a1df8ee3ffa3727ee3c14d365af 100644 (file)
--- a/copy.c
+++ b/copy.c
@@ -25,7 +25,7 @@
 #include <inttypes.h>
 #include <stdbool.h>
 #include <string.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "copy.h"
 #include "address.h"
@@ -540,8 +540,7 @@ static int count_delete_lines(FILE *fp, struct Body *b, LOFF_T *length, size_t d
  * * #MUTT_CM_DECODE_PGP used for decoding PGP messages
  * * #MUTT_CM_CHARCONV   perform character set conversion
  */
-int mutt_copy_message_fp(FILE *fpout, FILE *fpin, struct Header *hdr, int flags,
-                      int chflags)
+int mutt_copy_message_fp(FILE *fpout, FILE *fpin, struct Header *hdr, int flags, int chflags)
 {
   struct Body *body = hdr->content;
   char prefix[SHORT_STRING];

diff --git a/curs_lib.c b/curs_lib.c
index 2c2078c154c226ec0b5f88c35e39a4b40efe1f2d..dc2ed1d82e9b41c4ccd4604b0cb1c41c9cb294de 100644 (file)
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -41,7 +41,7 @@
 #include <termios.h>
 #include <unistd.h>
 #include <wchar.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "context.h"
 #include "enter_state.h"

diff --git a/curs_main.c b/curs_main.c
index 97acba5d9c5a2860835f2fcf2b47dd9980dff51a..9d6e67c86522b252cbd094efa385a3eb7ccfebae 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "alias.h"

diff --git a/edit.c b/edit.c
index a228f064f2de3e607c8ea61bbe357672c41894c3..edab0756bac408357fb46e65f189895d8c8e8367 100644 (file)
--- a/edit.c
+++ b/edit.c
@@ -33,7 +33,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "alias.h"
 #include "body.h"

diff --git a/editmsg.c b/editmsg.c
index 0d5b3ad5a7dee52cc239fe33680f5cec3d1844ef..629ea7a6262f613b0f8bdc23b43e0d7d2d60dcb4 100644 (file)
--- a/editmsg.c
+++ b/editmsg.c
@@ -31,7 +31,7 @@
 #include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "context.h"
 #include "copy.h"
@@ -52,8 +52,7 @@
  * @retval 0  Message edited successfully
  * @retval -1 Error
  */
-static int edit_or_view_one_message(bool edit, struct Context *ctx,
-                                    struct Header *cur)
+static int edit_or_view_one_message(bool edit, struct Context *ctx, struct Header *cur)
 {
   char tmp[_POSIX_PATH_MAX];
   char buff[STRING];

diff --git a/enter.c b/enter.c
index d939d12a752af17a3015ef5ff949ae6367f40093..780fc0b14f39edb48ccefe47f6ac775f7bb18dd4 100644 (file)
--- a/enter.c
+++ b/enter.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <wchar.h>
 #include <wctype.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "enter_state.h"
 #include "globals.h"
@@ -149,7 +149,7 @@ int mutt_enter_string(char *buf, size_t buflen, int col, int flags)
  * @retval -1 if abort
  */
 int mutt_enter_string_full(char *buf, size_t buflen, int col, int flags, int multiple,
-                      char ***files, int *numfiles, struct EnterState *state)
+                           char ***files, int *numfiles, struct EnterState *state)
 {
   int width = MuttMessageWindow->cols - col - 1;
   int redraw;

diff --git a/enter_state.h b/enter_state.h
index 87c1822600ebf4cf7d9e3cd6afd7a9250e5e2aaf..c4d2474e960f4e653e53690ca070526ae3fd6491 100644 (file)
--- a/enter_state.h
+++ b/enter_state.h
@@ -24,7 +24,7 @@
 #define _MUTT_ENTER_STATE_H
 
 #include <stddef.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 
 /**
  * struct EnterState - Keep our place when entering a string

diff --git a/envelope.c b/envelope.c
index 01707d3289e6679770cd1eec1d619254ab112736..1e36ba264557738fdaafb8ea0cd5e4290f7c88ce 100644 (file)
--- a/envelope.c
+++ b/envelope.c
@@ -34,9 +34,9 @@
 
 #include "config.h"
 #include <stddef.h>
-#include "lib/buffer.h"
-#include "lib/memory.h"
-#include "lib/queue.h"
+#include "mutt/buffer.h"
+#include "mutt/memory.h"
+#include "mutt/queue.h"
 #include "envelope.h"
 #include "rfc822.h"
 

diff --git a/envelope.h b/envelope.h
index e13f269cf0bac0bc2be5106b3069c6dc4e0c7f06..2453224359f84f5e9bad857b7be32faac054acde 100644 (file)
--- a/envelope.h
+++ b/envelope.h
@@ -24,7 +24,7 @@
 #define _MUTT_ENVELOPE_H
 
 #include <stdbool.h>
-#include "lib/list.h"
+#include "mutt/list.h"
 
 /**
  * struct Envelope - The header of an email

diff --git a/flags.c b/flags.c
index 3b3c198a4f08011bc39149dd5ba97ee5132d2df0..7103f2892374e5cc068a76618473da1612948c4e 100644 (file)
--- a/flags.c
+++ b/flags.c
@@ -23,7 +23,7 @@
 #include "config.h"
 #include <stddef.h>
 #include <stdbool.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "context.h"
 #include "globals.h"

diff --git a/from.c b/from.c
index f5f7550c379dfe3fcd87a622ee8665f476eb41c9..492c54c8bebf207b1799588e5cf28fa4c22a0005 100644 (file)
--- a/from.c
+++ b/from.c
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "globals.h"
 #include "protos.h"
 

diff --git a/globals.h b/globals.h
index 5fd8e97badac1b06b6f74dc0d17ae729673cb680..27395e655857a881ef5fc720d53eb52a8e475277 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -24,7 +24,7 @@
 #define _MUTT_GLOBALS_H
 
 #include <signal.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "where.h"
 #include "mutt_regex.h"
 

diff --git a/group.c b/group.c
index de83ae474c6febbdd02d9f706e81494074bf7f54..db7d569bcd07865731a5507470a6379dbbb16c29 100644 (file)
--- a/group.c
+++ b/group.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 #include <stdlib.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "group.h"
 #include "address.h"

diff --git a/handler.c b/handler.c
index 2fb71a92b1db43dafda80a9a8ff4171502544ee8..fefc5619a2504faff4850a89521bb9fc81cad821 100644 (file)
--- a/handler.c
+++ b/handler.c
@@ -37,7 +37,7 @@
 #include <unistd.h>
 #include <wchar.h>
 #include <wctype.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "body.h"
 #include "charset.h"

diff --git a/hcache/Makefile.am b/hcache/Makefile.am
index ac3aefd20373ca7d0454e34342744b5fe0f755f8..b0f67044e1603ae16e411429f00ade4c2d3c0715 100644 (file)
--- a/hcache/Makefile.am
+++ b/hcache/Makefile.am
@@ -37,20 +37,20 @@ libhcache_a_SOURCES += tc.c
 endif
 
 LIBMUTT = -L../lib -lmutt
-LIBMUTTDEPS = $(top_srcdir)/lib/lib.h ../lib/libmutt.a
+LIBMUTTDEPS = $(top_srcdir)/mutt/lib.h ../mutt/libmutt.a
 
 BUILT_SOURCES = $(HCVERSION)
 
 $(top_srcdir)/keymap_defs.h:
        +$(MAKE) -C $(top_srcdir) keymap_defs.h
 
-hcversion.h: $(top_srcdir)/mutt.h $(top_srcdir)/address.h $(top_srcdir)/lib/list.h \
-               $(top_srcdir)/lib/buffer.h $(top_srcdir)/parameter.h \
+hcversion.h: $(top_srcdir)/mutt.h $(top_srcdir)/address.h $(top_srcdir)/mutt/list.h \
+               $(top_srcdir)/mutt/buffer.h $(top_srcdir)/parameter.h \
                $(top_srcdir)/body.h $(top_srcdir)/envelope.h \
                $(top_srcdir)/header.h $(srcdir)/hcachever.sh
        ( echo '#include "config.h"'; echo '#include "mutt.h"'; \
-       echo '#include "address.h"'; echo '#include "lib/list.h"'; \
-       echo '#include "lib/buffer.h"'; echo '#include "parameter.h"'; \
+       echo '#include "address.h"'; echo '#include "mutt/list.h"'; \
+       echo '#include "mutt/buffer.h"'; echo '#include "parameter.h"'; \
        echo '#include "body.h"'; echo '#include "envelope.h"'; \
        echo '#include "header.h"'; \
        ) | $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) - | sh $(srcdir)/hcachever.sh hcversion.h

diff --git a/hcache/bdb.c b/hcache/bdb.c
index 5518c08861be89b775e3c83114f98b2791b86d59..0f3b96cfb9f9bb1c1c2d377b2ec6d4b74eb5dd4c 100644 (file)
--- a/hcache/bdb.c
+++ b/hcache/bdb.c
@@ -39,7 +39,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "backend.h"
 #include "globals.h"
 #include "mx.h"

diff --git a/hcache/gdbm.c b/hcache/gdbm.c
index 34c81e773c02f94f2de3206947a49f77c6e92f82..6d43e9507966f5346a2c3ba7c8d07da827a9f515 100644 (file)
--- a/hcache/gdbm.c
+++ b/hcache/gdbm.c
@@ -33,7 +33,7 @@
 #include "config.h"
 #include <stddef.h>
 #include <gdbm.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "backend.h"
 #include "globals.h"
 

diff --git a/hcache/hcache.c b/hcache/hcache.c
index 8f70675d7e604dd11283eee7aae579bd7880fe00..57c1de43dd105fc551dfa9ab0d583c9e4bda4b2f 100644 (file)
--- a/hcache/hcache.c
+++ b/hcache/hcache.c
@@ -47,7 +47,7 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <unistd.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "address.h"
 #include "backend.h"
 #include "body.h"

diff --git a/hcache/kc.c b/hcache/kc.c
index 6a6e2116c8cda11623379d55630b7ef9d6c45326..291c4d79385bf97d8ebb59ce81dc14b4f9600fd1 100644 (file)
--- a/hcache/kc.c
+++ b/hcache/kc.c
@@ -34,7 +34,7 @@
 #include <kclangc.h>
 #include <limits.h>
 #include <stdio.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "backend.h"
 #include "options.h"
 

diff --git a/hcache/lmdb.c b/hcache/lmdb.c
index 435daf88aabd401785437d3494765c6248c84cc1..50698e87358d61e043e8a74d00780d8d05f98d77 100644 (file)
--- a/hcache/lmdb.c
+++ b/hcache/lmdb.c
@@ -33,7 +33,7 @@
 #include "config.h"
 #include <stddef.h>
 #include <lmdb.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "backend.h"
 
 /** The maximum size of the database file (2GiB).

diff --git a/hcache/qdbm.c b/hcache/qdbm.c
index 7c3ba5edaaa5ef503efeda1255523e26cd054459..f8cec63aef1b85b0431b7aa6deacfb5c9a1877b5 100644 (file)
--- a/hcache/qdbm.c
+++ b/hcache/qdbm.c
@@ -34,7 +34,7 @@
 #include <stddef.h>
 #include <depot.h>
 #include <villa.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "backend.h"
 #include "options.h"
 

diff --git a/hcache/tc.c b/hcache/tc.c
index 350ab6781715d0f4807ecd71c5273eef31e0a151..47a09c7a8abd0f1dd7d40b19bed0bd0657ff1944 100644 (file)
--- a/hcache/tc.c
+++ b/hcache/tc.c
@@ -34,7 +34,7 @@
 #include <stddef.h>
 #include <tcbdb.h>
 #include <tcutil.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "backend.h"
 #include "options.h"
 

diff --git a/hdrline.c b/hdrline.c
index ad94363b9c4614122c731187c2bdb4916ac28e32..1b89a450c0bc3b0578605d7bce8e755eaa135d05 100644 (file)
--- a/hdrline.c
+++ b/hdrline.c
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "address.h"
 #include "body.h"

diff --git a/header.c b/header.c
index 5f0d8fb2b9cebe99d306f737eb2fa745cafbe028..c2f7de9df7e62358d45db88e413942635b422e32 100644 (file)
--- a/header.c
+++ b/header.c
@@ -28,14 +28,14 @@
 #include <stdio.h>
 #include <sys/stat.h>
 #include <time.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
+#include "header.h"
 #include "alias.h"
 #include "body.h"
 #include "context.h"
 #include "envelope.h"
 #include "globals.h"
-#include "header.h"
 #include "mutt_idna.h"
 #include "ncrypt/ncrypt.h"
 #include "options.h"
@@ -385,4 +385,3 @@ struct Header *mutt_new_header(void)
   STAILQ_INIT(&h->tags);
   return h;
 }
-

diff --git a/header.h b/header.h
index 4f634e18f95ea9e5d8909e21621ebbf792c6be32..0db5c054b6cc6d294f32d0d35ea02a99f8fa36cc 100644 (file)
--- a/header.h
+++ b/header.h
@@ -26,7 +26,7 @@
 #include <stddef.h>
 #include <stdbool.h>
 #include <time.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt_tags.h"
 
 /**

diff --git a/help.c b/help.c
index 218cf89db655cbac5c356ec5c254114842a50270..318ba5d8e13d51ec4885088cb4df437b0207f202 100644 (file)
--- a/help.c
+++ b/help.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <wchar.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "globals.h"
 #include "keymap.h"
 #include "mbyte.h"

diff --git a/history.c b/history.c
index e8a9432a9c0e6efa21b36db2a4178f1bcda9cdf0..68701c27d8c5d71cb741336f547015aa3191d1f2 100644 (file)
--- a/history.c
+++ b/history.c
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "history.h"
 #include "charset.h"
 #include "globals.h"

diff --git a/hook.c b/hook.c
index 034bd583181251710ea5737b8ea004f30ccc8a48..d949eaa2a8826d9acaa09d15b533c66e3e98e2a9 100644 (file)
--- a/hook.c
+++ b/hook.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "address.h"
 #include "context.h"

diff --git a/imap/auth.c b/imap/auth.c
index dc205e2f0ad094d853a798e07b8b7d02cad0a670..5ea3c7f0a7ebb6b7d82b54fe2c80c094134c8ba7 100644 (file)
--- a/imap/auth.c
+++ b/imap/auth.c
@@ -34,7 +34,7 @@
 
 #include "config.h"
 #include <string.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "auth.h"
 #include "globals.h"
 #include "protos.h"

diff --git a/imap/auth_anon.c b/imap/auth_anon.c
index af67e46d35577c7343d4464a2c97c651f6acf730..d6a0bb10cc9f2c6fae760dde1ce7ecf21ba5c70f 100644 (file)
--- a/imap/auth_anon.c
+++ b/imap/auth_anon.c
@@ -32,7 +32,7 @@
 
 #include "config.h"
 #include "imap_private.h"
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "conn/conn.h"
 #include "auth.h"
 #include "globals.h"

diff --git a/imap/auth_cram.c b/imap/auth_cram.c
index 14f5c8e52862cef58aaa500dc8d7a08d097bc848..6a593ad33f815c6c112a66c5fda254d1dc001a75 100644 (file)
--- a/imap/auth_cram.c
+++ b/imap/auth_cram.c
@@ -34,7 +34,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "imap_private.h"
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "conn/conn.h"
 #include "auth.h"
 #include "globals.h"

diff --git a/imap/auth_gss.c b/imap/auth_gss.c
index bac5629a97b3dc302e60896e60878445399dbe09..aea2d758a567963f680891b7ec0b9b82d6c9cae2 100644 (file)
--- a/imap/auth_gss.c
+++ b/imap/auth_gss.c
@@ -35,7 +35,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "imap_private.h"
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "auth.h"

diff --git a/imap/auth_login.c b/imap/auth_login.c
index 65cadab5aa2216e9d1b362ce1b429caa49585324..f5b66abb1fc30658b4c53e04fe8b0fef02068dee 100644 (file)
--- a/imap/auth_login.c
+++ b/imap/auth_login.c
@@ -33,7 +33,7 @@
 #include "config.h"
 #include <stdio.h>
 #include "imap_private.h"
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "auth.h"

diff --git a/imap/auth_plain.c b/imap/auth_plain.c
index a56e543378a6acdbdfa4ce778b9fc7dfb3e5d3f2..355125dc0f807b982da9937f8fe721c9e6078dd0 100644 (file)
--- a/imap/auth_plain.c
+++ b/imap/auth_plain.c
@@ -33,7 +33,7 @@
 
 #include "config.h"
 #include "imap_private.h"
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "conn/conn.h"
 #include "auth.h"
 #include "globals.h"

diff --git a/imap/auth_sasl.c b/imap/auth_sasl.c
index ee76d73b7330b5655c7f5f08acd4254a22b43d4c..134cb2900469c7fde34cb3c32f7bb011871dd48b 100644 (file)
--- a/imap/auth_sasl.c
+++ b/imap/auth_sasl.c
@@ -37,7 +37,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "imap_private.h"
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "conn/conn.h"
 #include "auth.h"
 #include "globals.h"

diff --git a/imap/browse.c b/imap/browse.c
index d25e427f831bcf42d4437ba0dbe7ad2ef1a584b7..333aa0032e74ecce6dabc5e1b789fef40b831578 100644 (file)
--- a/imap/browse.c
+++ b/imap/browse.c
@@ -42,7 +42,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "imap_private.h"
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "browser.h"
 #include "buffy.h"

diff --git a/imap/command.c b/imap/command.c
index c064098b32b49a1307124ba064027ebcf125ad35..c9425821c05b728fa1b7b758afb3f4ec2be2e8a1 100644 (file)
--- a/imap/command.c
+++ b/imap/command.c
@@ -46,7 +46,7 @@
 #include <string.h>
 #include <time.h>
 #include "imap_private.h"
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "conn/conn.h"
 #include "buffy.h"
 #include "context.h"

diff --git a/imap/imap.c b/imap/imap.c
index 3aadb33d2e90504cbdd8b095cf589d73ebbb435e..f18005c72fc7c803b36cc6a2a72e2a77ae557e4c 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -80,7 +80,7 @@
 #include <time.h>
 #include <unistd.h>
 #include "imap_private.h"
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "imap.h"

diff --git a/imap/imap_private.h b/imap/imap_private.h
index 15e4bd822d6bda913bb35c3cc6a457e60dcaaf5b..ab857c0a5f3b018e38caa98f4e3a1208db46f36b 100644 (file)
--- a/imap/imap_private.h
+++ b/imap/imap_private.h
@@ -27,7 +27,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <time.h>
-#include "lib/list.h"
+#include "mutt/list.h"
 #ifdef USE_HCACHE
 #include "hcache/hcache.h"
 #endif

diff --git a/imap/message.c b/imap/message.c
index 937662cf00de64dadcdf9f5ea469574f2fc2cda8..b52320f7f0662b662514122cff9c5706e35b1faf 100644 (file)
--- a/imap/message.c
+++ b/imap/message.c
@@ -48,7 +48,7 @@
 #include <string.h>
 #include <unistd.h>
 #include "imap_private.h"
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "message.h"

diff --git a/imap/message.h b/imap/message.h
index 040da7f61d177bc3cb2b63ee6568d0e35ce8a79f..6aa4ef3865f47278971761c18bd126718f68b269 100644 (file)
--- a/imap/message.h
+++ b/imap/message.h
@@ -26,7 +26,7 @@
 
 #include <stdbool.h>
 #include <time.h>
-#include "lib/list.h"
+#include "mutt/list.h"
 
 /**
  * struct ImapHeaderData - IMAP-specific header data

diff --git a/imap/utf7.c b/imap/utf7.c
index b33f00056e3cf7eeb739903793378ce30e546b1a..a944ca522dfe8af7fac4f405894d8aeed1a8c928 100644 (file)
--- a/imap/utf7.c
+++ b/imap/utf7.c
@@ -34,7 +34,7 @@
 #include "config.h"
 #include <string.h>
 #include "imap_private.h"
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "charset.h"
 #include "globals.h"
 

diff --git a/imap/util.c b/imap/util.c
index a104894b7074e3c969c393896bad0f5cf39fe7cd..098b41c90406f3d973f49184d587c306c9884425 100644 (file)
--- a/imap/util.c
+++ b/imap/util.c
@@ -76,7 +76,7 @@
 #include <time.h>
 #include <unistd.h>
 #include "imap_private.h"
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "bcache.h"

diff --git a/init.c b/init.c
index 5759c1b6874906d570d4bd67fd9035617f0fc443..55f80b4f967b164e39e1c98d88de3140ac0baac9 100644 (file)
--- a/init.c
+++ b/init.c
@@ -36,7 +36,7 @@
 #include <sys/utsname.h>
 #include <unistd.h>
 #include <wchar.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "init.h"
 #include "address.h"

diff --git a/keymap.c b/keymap.c
index 01f984ba4b1ba5dad67d2d1b392dbbc750d3ddbe..8dba8843c15b51c3eb205b32dc193caf16d1dca6 100644 (file)
--- a/keymap.c
+++ b/keymap.c
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "keymap.h"
 #include "functions.h"

diff --git a/keymap.h b/keymap.h
index 2f1ba6478306ca2acc073cabe5642bc4451c9818..d8e44b2d2a358fec0f8e5cbf2f5f91da7a2e53cd 100644 (file)
--- a/keymap.h
+++ b/keymap.h
@@ -24,7 +24,7 @@
 #define _MUTT_KEYMAP_H
 
 #include <stddef.h>
-#include "lib/mapping.h"
+#include "mutt/mapping.h"
 
 /* maximal length of a key binding sequence used for buffer in km_bindkey */
 #define MAX_SEQ 8

diff --git a/main.c b/main.c
index 7e8f3d531713d41bfb246eb162b79aa0da9ef65a..5b6033b5e80bffd2139332ca5c268e3baadd735c 100644 (file)
--- a/main.c
+++ b/main.c
@@ -37,7 +37,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "address.h"

diff --git a/mbox.c b/mbox.c
index a23b0fe413352dbcf70eaa36974b7ffb2657ab9f..8cd6702abbdbf44a921e706429dc3ddeb6bef9bc 100644 (file)
--- a/mbox.c
+++ b/mbox.c
@@ -32,7 +32,7 @@
 #include <time.h>
 #include <unistd.h>
 #include <utime.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "address.h"
 #include "body.h"
@@ -1157,7 +1157,7 @@ static int mbox_sync_mailbox(struct Context *ctx, int *index_hint)
       newOffset[i - first].hdr = ftello(fp) + offset;
 
       if (mutt_copy_message_ctx(fp, ctx, ctx->hdrs[i], MUTT_CM_UPDATE,
-                                 CH_FROM | CH_UPDATE | CH_UPDATE_LEN) != 0)
+                                CH_FROM | CH_UPDATE | CH_UPDATE_LEN) != 0)
       {
         mutt_perror(tempfile);
         mutt_sleep(5);

diff --git a/mbyte.c b/mbyte.c
index 74803841dc5d495bfac6b02ca37c73bfd4583f04..391c01737f5e0d874907219d98bcf869461f40dc 100644 (file)
--- a/mbyte.c
+++ b/mbyte.c
@@ -27,7 +27,7 @@
 #include <stdbool.h>
 #include <string.h>
 #include <wchar.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mbyte.h"
 #include "charset.h"
 #include "options.h"

diff --git a/mbyte.h b/mbyte.h
index 53506ddc55e812490df65814736e6cec99cd1a7e..367aeb02f45c832bec53cd3b31e7de65adb1ffd6 100644 (file)
--- a/mbyte.h
+++ b/mbyte.h
@@ -20,8 +20,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _MUTT_MBYTE_H
-#define _MUTT_MBYTE_H
+#ifndef _NEOMUTT_MBYTE_H
+#define _NEOMUTT_MBYTE_H
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -32,4 +32,4 @@ extern bool Charset_is_utf8;
 bool is_display_corrupting_utf8(wchar_t wc);
 int mutt_filter_unprintable(char **s);
 
-#endif /* _MUTT_MBYTE_H */
+#endif /* _NEOMUTT_MBYTE_H */

diff --git a/menu.c b/menu.c
index ebd1bdfd779dd333edcbf5970aa4faa9fc2b906c..51d603b5d82889a6b49643e4e334bfd4d57b2a5e 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <wchar.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "context.h"
 #include "globals.h"

diff --git a/mh.c b/mh.c
index 3a3b82de7d520c045be926c621be45ebb34ffc47..28f5670ba7e8ebf8cfa2de651e01d066a4d2f8b2 100644 (file)
--- a/mh.c
+++ b/mh.c
@@ -43,7 +43,7 @@
 #include <time.h>
 #include <unistd.h>
 #include <utime.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "body.h"
 #include "buffy.h"

diff --git a/lib/Makefile.am b/mutt/Makefile.am
similarity index 100%
rename from lib/Makefile.am
rename to mutt/Makefile.am

diff --git a/lib/base64.c b/mutt/base64.c
similarity index 100%
rename from lib/base64.c
rename to mutt/base64.c

diff --git a/lib/base64.h b/mutt/base64.h
similarity index 92%
rename from lib/base64.h
rename to mutt/base64.h
index 116befedf24d8222823fcfe0f3d8d8cca313d95f..174c6ee796a6ccf02f71c92a02927797538ff234 100644 (file)
--- a/lib/base64.h
+++ b/mutt/base64.h
@@ -18,8 +18,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _LIB_BASE64_H
-#define _LIB_BASE64_H
+#ifndef _MUTT_BASE64_H
+#define _MUTT_BASE64_H
 
 #include <stdio.h>
 
@@ -30,4 +30,4 @@ extern const int Index_64[];
 size_t mutt_to_base64(char *out, const char *cin, size_t len, size_t olen);
 int mutt_from_base64(char *out, const char *in);
 
-#endif /* _LIB_BASE64_H */
+#endif /* _MUTT_BASE64_H */

diff --git a/lib/buffer.c b/mutt/buffer.c
similarity index 100%
rename from lib/buffer.c
rename to mutt/buffer.c

diff --git a/lib/buffer.h b/mutt/buffer.h
similarity index 95%
rename from lib/buffer.h
rename to mutt/buffer.h
index efb78e0872865ef91f09860a8abf582ba7e22b44..5642b4d9875004024beb74e55165d18e72b81af7 100644 (file)
--- a/lib/buffer.h
+++ b/mutt/buffer.h
@@ -21,8 +21,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _LIB_BUFFER_H
-#define _LIB_BUFFER_H
+#ifndef _MUTT_BUFFER_H
+#define _MUTT_BUFFER_H
 
 #include <stddef.h>
 
@@ -48,4 +48,4 @@ struct Buffer *mutt_buffer_new(void);
 int            mutt_buffer_printf(struct Buffer *buf, const char *fmt, ...);
 void           mutt_buffer_reset(struct Buffer *b);
 
-#endif /* _LIB_BUFFER_H */
+#endif /* _MUTT_BUFFER_H */

diff --git a/lib/date.c b/mutt/date.c
similarity index 100%
rename from lib/date.c
rename to mutt/date.c

diff --git a/lib/date.h b/mutt/date.h
similarity index 96%
rename from lib/date.h
rename to mutt/date.h
index 9594b98ff290bb196235e452bf784a1327313830..64cd1162236f82fac6bd8c5e86c9aad1c6a2b8a7 100644 (file)
--- a/lib/date.h
+++ b/mutt/date.h
@@ -20,8 +20,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _LIB_DATE_H
-#define _LIB_DATE_H
+#ifndef _MUTT_DATE_H
+#define _MUTT_DATE_H
 
 #include <stdbool.h>
 #include <time.h>
@@ -51,4 +51,4 @@ time_t  mutt_mktime(struct tm *t, int local);
 void    mutt_normalize_time(struct tm *tm);
 time_t  mutt_parse_date(const char *s, struct Tz *tz_out);
 
-#endif /* _LIB_DATE_H */
+#endif /* _MUTT_DATE_H */

diff --git a/lib/debug.c b/mutt/debug.c
similarity index 100%
rename from lib/debug.c
rename to mutt/debug.c

diff --git a/lib/debug.h b/mutt/debug.h
similarity index 92%
rename from lib/debug.h
rename to mutt/debug.h
index 0f14f2db22ae5163e3611046f6ac8b9f663a2d18..9208b9ee11b5421874df485d3ed8b69a075b6954 100644 (file)
--- a/lib/debug.h
+++ b/mutt/debug.h
@@ -20,8 +20,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _LIB_DEBUG_H
-#define _LIB_DEBUG_H
+#ifndef _MUTT_DEBUG_H
+#define _MUTT_DEBUG_H
 
 #ifdef DEBUG
 void mutt_debug(int level, const char *fmt, ...);
@@ -29,4 +29,4 @@ void mutt_debug(int level, const char *fmt, ...);
 #define mutt_debug(...) do { } while (0)
 #endif
 
-#endif /* _LIB_DEBUG_H */
+#endif /* _MUTT_DEBUG_H */

diff --git a/lib/exit.c b/mutt/exit.c
similarity index 100%
rename from lib/exit.c
rename to mutt/exit.c

diff --git a/lib/exit.h b/mutt/exit.h
similarity index 92%
rename from lib/exit.h
rename to mutt/exit.h
index 42845c8818c1a4c3d6d4ebe1e1a91ada21c05833..0d46ba3844263599fb0c5f219926d888c358f321 100644 (file)
--- a/lib/exit.h
+++ b/mutt/exit.h
@@ -20,9 +20,9 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _LIB_EXIT_H
-#define _LIB_EXIT_H
+#ifndef _MUTT_EXIT_H
+#define _MUTT_EXIT_H
 
 void mutt_exit(int code);
 
-#endif /* _LIB_EXIT_H */
+#endif /* _MUTT_EXIT_H */

diff --git a/lib/file.c b/mutt/file.c
similarity index 99%
rename from lib/file.c
rename to mutt/file.c
index 63cce57f3288ec3daa80bb82de3e107ec514582d..2c1ea43b8cd49377f042f5fe811b38d13eefd3bc 100644 (file)
--- a/lib/file.c
+++ b/mutt/file.c
@@ -1260,4 +1260,3 @@ int mbox_check_empty(const char *path)
 
   return ((st.st_size == 0));
 }
-

diff --git a/lib/file.h b/mutt/file.h
similarity index 97%
rename from lib/file.h
rename to mutt/file.h
index 3a37cb21593c543e0d2837e229ef43ec6edbd253..55eb9be521b58ace38ffbd511effbb0d83e23757 100644 (file)
--- a/lib/file.h
+++ b/mutt/file.h
@@ -20,8 +20,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _LIB_FILE_H
-#define _LIB_FILE_H
+#ifndef _MUTT_FILE_H
+#define _MUTT_FILE_H
 
 #include <stdio.h>
 #include <sys/types.h>
@@ -63,4 +63,4 @@ int         safe_rename(const char *src, const char *target);
 int         safe_symlink(const char *oldpath, const char *newpath);
 int         to_absolute_path(char *path, const char *reference);
 
-#endif /* _LIB_FILE_H */
+#endif /* _MUTT_FILE_H */

diff --git a/lib/hash.c b/mutt/hash.c
similarity index 100%
rename from lib/hash.c
rename to mutt/hash.c

diff --git a/lib/hash.h b/mutt/hash.h
similarity index 97%
rename from lib/hash.h
rename to mutt/hash.h
index 8f1d7a17a8b946927aa5b248f7af02acff4c42e4..74aaffd21970fe29698dcc4cd7c1c679ec031dbc 100644 (file)
--- a/lib/hash.h
+++ b/mutt/hash.h
@@ -20,8 +20,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _LIB_HASH_H
-#define _LIB_HASH_H
+#ifndef _MUTT_HASH_H
+#define _MUTT_HASH_H
 
 #include <stdbool.h>
 
@@ -84,4 +84,4 @@ struct HashWalkState
 
 struct HashElem *hash_walk(const struct Hash *table, struct HashWalkState *state);
 
-#endif /* _LIB_HASH_H */
+#endif /* _MUTT_HASH_H */

diff --git a/lib/list.c b/mutt/list.c
similarity index 99%
rename from lib/list.c
rename to mutt/list.c
index d3488aaefade9318bb48aefc4efc11881b09ae25..ae4631eff321260b7b955884fad2fcc9c2348999 100644 (file)
--- a/lib/list.c
+++ b/mutt/list.c
@@ -192,4 +192,3 @@ int strict_cmp_stailq(const struct ListHead *ah, const struct ListHead *bh)
 
   return 1;
 }
-

diff --git a/lib/list.h b/mutt/list.h
similarity index 95%
rename from lib/list.h
rename to mutt/list.h
index f1b4aee2b9c222e38c363a38a201217ddd460e3c..54d3f4a9f5f6f2d7105c85d39e13c143745d2f71 100644 (file)
--- a/lib/list.h
+++ b/mutt/list.h
@@ -21,12 +21,12 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _LIB_LIST_H
-#define _LIB_LIST_H
+#ifndef _MUTT_LIST_H
+#define _MUTT_LIST_H
 
 #include <string.h>
 #include <stdbool.h>
-#include "lib/queue.h"
+#include "mutt/queue.h"
 
 /**
  * struct ListNode - A List node for strings
@@ -54,4 +54,4 @@ struct ListNode *mutt_list_insert_tail(struct ListHead *h, char *s);
 bool             mutt_list_match(const char *s, struct ListHead *h);
 int              strict_cmp_stailq(const struct ListHead *ah, const struct ListHead *bh);
 
-#endif /* _LIB_LIST_H */
+#endif /* _MUTT_LIST_H */

diff --git a/lib/mapping.c b/mutt/mapping.c
similarity index 100%
rename from lib/mapping.c
rename to mutt/mapping.c

diff --git a/lib/mapping.h b/mutt/mapping.h
similarity index 100%
rename from lib/mapping.h
rename to mutt/mapping.h

diff --git a/lib/mbyte.c b/mutt/mbyte.c
similarity index 99%
rename from lib/mbyte.c
rename to mutt/mbyte.c
index 84574ccc78ccae16570ed7ff8c90ac49ed1f3a24..8ab7c4a1a28181c8a0408fb837ec17d7380dd424 100644 (file)
--- a/lib/mbyte.c
+++ b/mutt/mbyte.c
@@ -349,4 +349,3 @@ bool is_shell_char(wchar_t ch)
   static const wchar_t shell_chars[] = L"<>&()$?*;{}| "; /* ! not included because it can be part of a pathname in NeoMutt */
   return wcschr(shell_chars, ch) != NULL;
 }
-

diff --git a/lib/mbyte.h b/mutt/mbyte.h
similarity index 96%
rename from lib/mbyte.h
rename to mutt/mbyte.h
index afe0b1d82fc3697c7f0265b27c9ff9cb71850f11..5c710430333374a559acd5cbb83501b3027e086f 100644 (file)
--- a/lib/mbyte.h
+++ b/mutt/mbyte.h
@@ -20,8 +20,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _LIB_MBYTE_H
-#define _LIB_MBYTE_H
+#ifndef _MUTT_MBYTE_H
+#define _MUTT_MBYTE_H
 
 #include <stddef.h>
 #include <ctype.h>
@@ -51,4 +51,4 @@ int    my_wcwidth(wchar_t wc);
 int    my_width(const char *str, int col, bool display);
 size_t width_ceiling(const wchar_t *s, size_t n, int w1);
 
-#endif /* _LIB_MBYTE_H */
+#endif /* _MUTT_MBYTE_H */

diff --git a/lib/md5.c b/mutt/md5.c
similarity index 100%
rename from lib/md5.c
rename to mutt/md5.c

diff --git a/lib/md5.h b/mutt/md5.h
similarity index 96%
rename from lib/md5.h
rename to mutt/md5.h
index 7227c0f6ecfb299d4c20359b725c5ad06916b585..3eb9564e32bce80500364c36d4700f0aacfd3204 100644 (file)
--- a/lib/md5.h
+++ b/mutt/md5.h
@@ -20,8 +20,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _LIB_MD5_H
-#define _LIB_MD5_H
+#ifndef _MUTT_MD5_H
+#define _MUTT_MD5_H
 
 #include <stdint.h>
 #include <stdio.h>
@@ -53,4 +53,4 @@ void  md5_process_bytes(const void *buffer, size_t len, struct Md5Ctx *ctx);
 void *md5_read_ctx(const struct Md5Ctx *ctx, void *resbuf);
 int   md5_stream(FILE *stream, void *resblock);
 
-#endif /* _LIB_MD5_H */
+#endif /* _MUTT_MD5_H */

diff --git a/lib/memory.c b/mutt/memory.c
similarity index 100%
rename from lib/memory.c
rename to mutt/memory.c

diff --git a/lib/memory.h b/mutt/memory.h
similarity index 93%
rename from lib/memory.h
rename to mutt/memory.h
index 184805873e270d6b41eae3dfa47c955600c006f2..52b461c15fbc9c95c1312b9ba06df9a8a2b77152 100644 (file)
--- a/lib/memory.h
+++ b/mutt/memory.h
@@ -20,8 +20,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _LIB_MEMORY_H
-#define _LIB_MEMORY_H
+#ifndef _MUTT_MEMORY_H
+#define _MUTT_MEMORY_H
 
 #include <stddef.h>
 
@@ -39,4 +39,4 @@ void  safe_realloc(void *ptr, size_t size);
 
 #define FREE(x) safe_free(x)
 
-#endif /* _LIB_MEMORY_H */
+#endif /* _MUTT_MEMORY_H */

diff --git a/lib/message.c b/mutt/message.c
similarity index 100%
rename from lib/message.c
rename to mutt/message.c

diff --git a/lib/message.h b/mutt/message.h
similarity index 93%
rename from lib/message.h
rename to mutt/message.h
index 4a9bc60fe99f547ba883c1e057792597d7a4830f..d23d6bb3b06c8d59c826b04f9c56b1f2b9f9d958 100644 (file)
--- a/lib/message.h
+++ b/mutt/message.h
@@ -20,8 +20,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _LIB_MESSAGE_H
-#define _LIB_MESSAGE_H
+#ifndef _MUTT_MESSAGE_H
+#define _MUTT_MESSAGE_H
 
 #ifdef ENABLE_NLS
 #include <libintl.h>
@@ -40,4 +40,4 @@ void (*mutt_error)  (const char *format, ...);
 void (*mutt_message)(const char *format, ...);
 void (*mutt_perror) (const char *message);
 
-#endif /* _LIB_MESSAGE_H */
+#endif /* _MUTT_MESSAGE_H */

diff --git a/lib/lib.h b/mutt/mutt.h
similarity index 96%
rename from lib/lib.h
rename to mutt/mutt.h
index fc529b5fd281ca7e04ea3fc9b6e0a5ac8b726833..ee1f64fbe29a86c87e353da933a37172b2bfd0af 100644 (file)
--- a/lib/lib.h
+++ b/mutt/mutt.h
@@ -45,8 +45,8 @@
  * -# @subpage string
  */
 
-#ifndef _LIB_LIB_H
-#define _LIB_LIB_H
+#ifndef _MUTT_MUTT_H
+#define _MUTT_MUTT_H
 
 #include "base64.h"
 #include "buffer.h"
@@ -64,4 +64,4 @@
 #include "sha1.h"
 #include "string2.h"
 
-#endif /* _LIB_LIB_H */
+#endif /* _MUTT_MUTT_H */

diff --git a/lib/queue.h b/mutt/queue.h
similarity index 100%
rename from lib/queue.h
rename to mutt/queue.h

diff --git a/lib/sha1.c b/mutt/sha1.c
similarity index 100%
rename from lib/sha1.c
rename to mutt/sha1.c

diff --git a/lib/sha1.h b/mutt/sha1.h
similarity index 95%
rename from lib/sha1.h
rename to mutt/sha1.h
index 8a36ac23b16e0a3a1eb73c786f39c3a19367f0e3..47449598b4bc602f2d056c8fe3b28f43f3b3eac2 100644 (file)
--- a/lib/sha1.h
+++ b/mutt/sha1.h
@@ -22,8 +22,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _LIB_SHA1_H
-#define _LIB_SHA1_H
+#ifndef _MUTT_SHA1_H
+#define _MUTT_SHA1_H
 
 #include <stdint.h>
 
@@ -44,4 +44,4 @@ void sha1_update(struct Sha1Ctx *context, const unsigned char *data, uint32_t le
 
 #define SHA_DIGEST_LENGTH 20
 
-#endif /* _LIB_SHA1_H */
+#endif /* _MUTT_SHA1_H */

diff --git a/lib/string.c b/mutt/string.c
similarity index 100%
rename from lib/string.c
rename to mutt/string.c

diff --git a/lib/string2.h b/mutt/string2.h
similarity index 98%
rename from lib/string2.h
rename to mutt/string2.h
index c7dff15a137d92b01e1725ec152458bd8e1cd3ce..e3c5bf5ea3ffc380a54e7bc3c3361f6f2e62937d 100644 (file)
--- a/lib/string2.h
+++ b/mutt/string2.h
@@ -24,8 +24,8 @@
  * #include <string.h>
  */
 
-#ifndef _LIB_STRING_H
-#define _LIB_STRING_H
+#ifndef _MUTT_STRING_H
+#define _MUTT_STRING_H
 
 #include <ctype.h>
 #include <stdbool.h>
@@ -91,4 +91,4 @@ char *      skip_email_wsp(const char *s);
 char *      strfcpy(char *dest, const char *src, size_t dlen);
 char *      strnfcpy(char *dest, char *src, size_t size, size_t dlen);
 
-#endif /* _LIB_STRING_H */
+#endif /* _MUTT_STRING_H */

diff --git a/mutt_account.c b/mutt_account.c
index f2a0d1c9b32ffc71dd640aa2304fc2be215e3ce5..e1a80c289c11694241dbfaa84b2737c5cb2eba13 100644 (file)
--- a/mutt_account.c
+++ b/mutt_account.c
@@ -23,7 +23,7 @@
 #include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "mutt_account.h"
 #include "globals.h"

diff --git a/mutt_curses.h b/mutt_curses.h
index b0bb13d65e170f1d4230e0389a1f0f8ef45ce180..0f4f068e2990c88b70270b4323a9ca5762f43ce2 100644 (file)
--- a/mutt_curses.h
+++ b/mutt_curses.h
@@ -25,9 +25,9 @@
 #define _MUTT_CURSES_H
 
 #include <regex.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "options.h"
-#include "lib/queue.h"
+#include "mutt/queue.h"
 
 #ifdef USE_SLANG_CURSES
 

diff --git a/mutt_idna.c b/mutt_idna.c
index 7a956fdca5f91daf6c1842b0a975981212644a9b..b5673f593d225913ba196019c19011e3b2d2e3ba 100644 (file)
--- a/mutt_idna.c
+++ b/mutt_idna.c
@@ -24,7 +24,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt_idna.h"
 #include "address.h"
 #include "charset.h"

diff --git a/mutt_lua.c b/mutt_lua.c
index bac8db9187ae7c5e1dde6764de1d24d9b4d5ef79..8b2cd84f5e87ca42710e8c4387d150e3a622bbf1 100644 (file)
--- a/mutt_lua.c
+++ b/mutt_lua.c
@@ -29,7 +29,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "mutt_lua.h"
 #include "globals.h"

diff --git a/mutt_notmuch.c b/mutt_notmuch.c
index 1a010b38b06b3715685690844627c326f59f6050..63471c8859fe4fbd4bf89789e5423b1cb26da3c8 100644 (file)
--- a/mutt_notmuch.c
+++ b/mutt_notmuch.c
@@ -46,7 +46,7 @@
 #include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "mutt_notmuch.h"
 #include "body.h"

diff --git a/mutt_socket.c b/mutt_socket.c
index 6e74ad36531e7d2c68dc26c7edb13f24591a00e1..53b67ce1a6566e98c05ad4bd66f12618c1c2e487 100644 (file)
--- a/mutt_socket.c
+++ b/mutt_socket.c
@@ -23,8 +23,8 @@
 #include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "lib/lib.h"
-#include "lib/queue.h"
+#include "mutt/mutt.h"
+#include "mutt/queue.h"
 #include "conn/conn.h"
 #include "mutt_socket.h"
 #include "globals.h"

diff --git a/mutt_socket.h b/mutt_socket.h
index ed3ff4ea8d3288775ac1bc0f6b503d68f999225b..f536554abfd99a08ae804ae1389ceee8333527a7 100644 (file)
--- a/mutt_socket.h
+++ b/mutt_socket.h
@@ -23,7 +23,7 @@
 #ifndef _MUTT_SOCKET_H
 #define _MUTT_SOCKET_H
 
-#include "lib/queue.h"
+#include "mutt/queue.h"
 #include "conn/conn.h"
 
 struct Account;

diff --git a/mutt_tags.c b/mutt_tags.c
index 000dd1c2cc6ae8e6d58d12eee0d84793989779d8..fcac4d3a5b6c92c7b1d24ff6bfdefbd533bad734 100644 (file)
--- a/mutt_tags.c
+++ b/mutt_tags.c
@@ -23,9 +23,9 @@
 #include <stddef.h>
 
 #include "config.h"
-#include "lib/hash.h"
-#include "lib/queue.h"
-#include "lib/string2.h"
+#include "mutt/hash.h"
+#include "mutt/queue.h"
+#include "mutt/string2.h"
 #include "globals.h"
 #include "mutt_tags.h"
 

diff --git a/mutt_tags.h b/mutt_tags.h
index 02d483fd4608ae74144066fdbf0782825aa34251..cca9f811c21a216d89d02467dfdf31434e0e55b2 100644 (file)
--- a/mutt_tags.h
+++ b/mutt_tags.h
@@ -25,7 +25,7 @@
 
 #include <stdbool.h>
 #include <stddef.h>
-#include "lib/queue.h"
+#include "mutt/queue.h"
 
 /**
  * struct TagNode - LinkedList Tag Element

diff --git a/muttlib.c b/muttlib.c
index ed5ac8364edec3468af98c1a5e72e3ad02e781fe..c7c33a8f020c67e0463d8199e13a1a599110254e 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -43,7 +43,7 @@
 #include <unistd.h>
 #include <utime.h>
 #include <wchar.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "address.h"
 #include "alias.h"

diff --git a/mx.c b/mx.c
index 1a42caa74fccae42b29a203715622e287f5c45ee..5f66bde32c1049e1753eed8a94e7a87d95ae56b8 100644 (file)
--- a/mx.c
+++ b/mx.c
@@ -32,7 +32,7 @@
 #include <time.h>
 #include <unistd.h>
 #include <utime.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "mx.h"
 #include "address.h"

diff --git a/ncrypt/crypt.c b/ncrypt/crypt.c
index fd4a8042bacbd63e3e5e61721470b0a291e7dded..87b8580e1146751309831b4660541b3eb7d263b4 100644 (file)
--- a/ncrypt/crypt.c
+++ b/ncrypt/crypt.c
@@ -32,7 +32,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "address.h"
 #include "alias.h"

diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c
index 4d7f4994f3d09f2ec6b42d8892e353b64df3fea9..3a4c875d76e66cb3e5633a09fd642295e3353f11 100644 (file)
--- a/ncrypt/crypt_gpgme.c
+++ b/ncrypt/crypt_gpgme.c
@@ -45,7 +45,7 @@
 #include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "address.h"
 #include "alias.h"

diff --git a/ncrypt/crypt_mod.c b/ncrypt/crypt_mod.c
index f809b24793b5832586f2c40a56d724805b4bcea9..940ab4b1cc1539164749fa7c2be1b63214615355 100644 (file)
--- a/ncrypt/crypt_mod.c
+++ b/ncrypt/crypt_mod.c
@@ -21,8 +21,8 @@
  */
 
 #include "config.h"
-#include "lib/lib.h"
-#include "lib/queue.h"
+#include "mutt/mutt.h"
+#include "mutt/queue.h"
 #include "crypt_mod.h"
 
 /**

diff --git a/ncrypt/cryptglue.c b/ncrypt/cryptglue.c
index fa729d8743082750b3f51a8d67053e6daf9a885f..c22c9a1cf6a64ffdd1ed2d3c19c49cbb0c6cb79a 100644 (file)
--- a/ncrypt/cryptglue.c
+++ b/ncrypt/cryptglue.c
@@ -34,7 +34,7 @@
 
 #include "config.h"
 #include <stdio.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "crypt_mod.h"
 #include "globals.h"
 #include "ncrypt.h"

diff --git a/ncrypt/gnupgparse.c b/ncrypt/gnupgparse.c
index a781c3f6ea2d001eab46b7a7402ab15d18523884..93f49ce41fba55493977f81cade80eaae200b6e9 100644 (file)
--- a/ncrypt/gnupgparse.c
+++ b/ncrypt/gnupgparse.c
@@ -38,7 +38,7 @@
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "charset.h"
 #include "filter.h"

diff --git a/ncrypt/pgp.c b/ncrypt/pgp.c
index 942aeb78655ce549194d3ed7c517e0413f1f883f..55e3d4eab46969f09107517d6d64ade9a502354d 100644 (file)
--- a/ncrypt/pgp.c
+++ b/ncrypt/pgp.c
@@ -43,7 +43,7 @@
 #include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "address.h"
 #include "body.h"

diff --git a/ncrypt/pgpinvoke.c b/ncrypt/pgpinvoke.c
index 30c6f7a1d4cf7d85ed4a536297fba74c3500433f..45c39cff043f593cab77f224cffa4ce9f7e90636 100644 (file)
--- a/ncrypt/pgpinvoke.c
+++ b/ncrypt/pgpinvoke.c
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "address.h"
 #include "filter.h"
 #include "format_flags.h"

diff --git a/ncrypt/pgpkey.c b/ncrypt/pgpkey.c
index bc2c56bef4c082775841139f7d64482a353c018a..ff4a77826859f85153c4e68024cfdbb4c481960b 100644 (file)
--- a/ncrypt/pgpkey.c
+++ b/ncrypt/pgpkey.c
@@ -32,7 +32,7 @@
 #include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "pgpkey.h"
 #include "address.h"

diff --git a/ncrypt/pgplib.c b/ncrypt/pgplib.c
index e0ebf35cd77041d23050b5f2362da39a17a4a6d8..a3b7e03b4d0274b3a3ea582461d9b19eb65ce407 100644 (file)
--- a/ncrypt/pgplib.c
+++ b/ncrypt/pgplib.c
@@ -24,7 +24,7 @@
 
 #include "config.h"
 #include <stdbool.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "pgplib.h"
 
 const char *pgp_pkalgbytype(unsigned char type)

diff --git a/ncrypt/pgplib.h b/ncrypt/pgplib.h
index b58e26e6a38cd1d9a96cfbde62779435ce393192..1d198b7224327e49d5f30f265b50748d1dad1183 100644 (file)
--- a/ncrypt/pgplib.h
+++ b/ncrypt/pgplib.h
@@ -28,7 +28,7 @@
 
 #include <stdbool.h>
 #include <time.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 
 /**
  * struct PgpSignature - PGP Signature

diff --git a/ncrypt/pgpmicalg.c b/ncrypt/pgpmicalg.c
index aa91687a49b319b0f9c4910278dc0901c96f52e1..6aa01a464ab4118cdc6d7e29524faeaf4291374f 100644 (file)
--- a/ncrypt/pgpmicalg.c
+++ b/ncrypt/pgpmicalg.c
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "pgppacket.h"
 #include "protos.h"

diff --git a/ncrypt/pgppacket.c b/ncrypt/pgppacket.c
index c741d7506fb70acca1d001c9e7c68cb4a81c5500..110ffa23a6c953d8c49fc7a54ff5229fc78f2475 100644 (file)
--- a/ncrypt/pgppacket.c
+++ b/ncrypt/pgppacket.c
@@ -24,7 +24,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 
 #define CHUNKSIZE 1024
 

diff --git a/ncrypt/smime.c b/ncrypt/smime.c
index 41f0d912d17d49e485ac64aba2e4896046211d6e..42457f88b138dfd13fa7c05811a4b69c845c4942 100644 (file)
--- a/ncrypt/smime.c
+++ b/ncrypt/smime.c
@@ -32,7 +32,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <time.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "address.h"
 #include "alias.h"

diff --git a/newsrc.c b/newsrc.c
index ce8925ac1b4465edc63c325e7efa1ccd1a000749..ee1c16ccea33006a3f19d4aa902ef3b5295fd8cc 100644 (file)
--- a/newsrc.c
+++ b/newsrc.c
@@ -32,7 +32,7 @@
 #include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "bcache.h"

diff --git a/nntp.c b/nntp.c
index 8648ec5f7c65aaa8fbd4becc528c1f7c8fe8d60a..9c5cd5c21eb4f98e7d1a41237164f3b33c285b7e 100644 (file)
--- a/nntp.c
+++ b/nntp.c
@@ -27,7 +27,7 @@
 #include <limits.h>
 #include <string.h>
 #include <unistd.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "nntp.h"

diff --git a/pager.c b/pager.c
index c3c3bfeb3aaa573e061326ebd4ca518b50e55f89..8fc7474eca8ecc2b588c3309bb9a62eb39c79900 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -35,7 +35,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <wchar.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "alias.h"
 #include "attach.h"

diff --git a/parameter.h b/parameter.h
index d5d6e45cd49720b9df3041d5b9b2b77b6b2355f1..f37f1c49ec1592a5e18976772822c9dda2aa7964 100644 (file)
--- a/parameter.h
+++ b/parameter.h
@@ -23,7 +23,7 @@
 #ifndef _MUTT_PARAMETER_H
 #define _MUTT_PARAMETER_H
 
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 
 /**
  * struct Parameter - Attribute associated with a MIME part

diff --git a/parse.c b/parse.c
index ce7c8ffaa448050a5fd60cfe6954043364c09a46..3cc119c2e6981f80fdb3e5ddf3d97d66e390e4ae 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "body.h"
 #include "charset.h"

diff --git a/pattern.c b/pattern.c
index f70d9e59d17306eefebb6de4497b4285391dd715..0815f6cccb9d8165004a71a08d375de678c2acc4 100644 (file)
--- a/pattern.c
+++ b/pattern.c
@@ -38,7 +38,7 @@
 #include <unistd.h>
 #include <wchar.h>
 #include <wctype.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "address.h"
 #include "body.h"

diff --git a/pattern.h b/pattern.h
index 7e64e36f4dc650e123fe1ed8fb5c9097a09bf3f9..114bb8c36321d4773b9de90cca9e80edc73e7bbc 100644 (file)
--- a/pattern.h
+++ b/pattern.h
@@ -26,7 +26,7 @@
 #include <regex.h>
 #include <stdbool.h>
 #include <stddef.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 
 struct Address;
 struct Buffer;

diff --git a/pgppubring.c b/pgppubring.c
index dce20b96eb6e0a2ec65420512e82b4c0fa13d3ef..2b34c1115277cfe871c3e8ef68976801ecaac8fa 100644 (file)
--- a/pgppubring.c
+++ b/pgppubring.c
@@ -42,7 +42,7 @@
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "ncrypt/ncrypt.h"
 #include "ncrypt/pgplib.h"
 #include "ncrypt/pgppacket.h"

diff --git a/pop.c b/pop.c
index 76b8a9850b463654c6cf5490653edc7054b3b70d..620b46ab3eb8b8442bf55908e5ec59df22b38440 100644 (file)
--- a/pop.c
+++ b/pop.c
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "pop.h"

diff --git a/pop_auth.c b/pop_auth.c
index 42478d07525c13c8908c31d65ab73c62493af1c5..7856b7bb8d08577d93642ff289e438711df7173b 100644 (file)
--- a/pop_auth.c
+++ b/pop_auth.c
@@ -24,7 +24,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "globals.h"

diff --git a/pop_lib.c b/pop_lib.c
index 7fc5fd1de91ad262fa7157425e59d5b23dbab1d4..01a36cf45574cf74d12d90164205d8d06543a9f1 100644 (file)
--- a/pop_lib.c
+++ b/pop_lib.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "context.h"

diff --git a/postpone.c b/postpone.c
index f81330129d76c695d1fe398b29ac2d89a6a05950..7c1ee8baf5d3adf4abf048b3fc30406d2b69135c 100644 (file)
--- a/postpone.c
+++ b/postpone.c
@@ -29,7 +29,7 @@
 #include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "body.h"
 #include "context.h"

diff --git a/query.c b/query.c
index ca13384735093998556d665c22560d53f492f199..59e2cc81cb8124a6b4381988e65aa8641d403558 100644 (file)
--- a/query.c
+++ b/query.c
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "address.h"
 #include "alias.h"

diff --git a/recvattach.c b/recvattach.c
index 0bcd068bb02add1d6c05c3393ed79cbbf528eedd..2b3d7a454853ce216e1e668e78ac4a2146838dca 100644 (file)
--- a/recvattach.c
+++ b/recvattach.c
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "attach.h"
 #include "body.h"

diff --git a/recvcmd.c b/recvcmd.c
index c3587d48ad8b7d526077aa4ae958ff4f4ab77f0d..babafcf563c30edcf9eed7a0d294db52f72094ff 100644 (file)
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -25,7 +25,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "alias.h"
 #include "attach.h"

diff --git a/remailer.c b/remailer.c
index d925562f7d97e1e028145d1e8e45385e45a2b222..a7b3ae5a9aa84a7cb57ce04427cec25fbef9804e 100644 (file)
--- a/remailer.c
+++ b/remailer.c
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "remailer.h"
 #include "address.h"

diff --git a/resize.c b/resize.c
index a343ed05e2a75e2b832ed3ffd2e58897530952a0..f1de053d3b34eb2ec7a05a1cf3c52b953132c511 100644 (file)
--- a/resize.c
+++ b/resize.c
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <termios.h>
 #include <unistd.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt_curses.h"
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>

diff --git a/rfc1524.c b/rfc1524.c
index 5bae77504d4e2b29978edbbb13ad67c885489f27..ab2b3fe0f302e81091550c39aacfe51ca8b7a2b0 100644 (file)
--- a/rfc1524.c
+++ b/rfc1524.c
@@ -35,7 +35,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "rfc1524.h"
 #include "body.h"

diff --git a/rfc2047.c b/rfc2047.c
index c41a991bd1faca1b36bd8c59b4ed471c8094aaf7..039affe8ce07e7894b04c6c0e8f141b08eedcf9c 100644 (file)
--- a/rfc2047.c
+++ b/rfc2047.c
@@ -26,7 +26,7 @@
 #include <errno.h>
 #include <iconv.h>
 #include <string.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "rfc2047.h"
 #include "address.h"
 #include "charset.h"

diff --git a/rfc2231.c b/rfc2231.c
index b7a0808878dc41d89b56435d7362e3916dc28604..ed23aa573de2b340d99dfce0c0dc0f2ba86cfbad 100644 (file)
--- a/rfc2231.c
+++ b/rfc2231.c
@@ -34,7 +34,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "rfc2231.h"
 #include "charset.h"
 #include "globals.h"

diff --git a/rfc3676.c b/rfc3676.c
index dac8cbe40b36c12a83024ac684a1e72e816ab444..8c42f15456b3d2e3197e5bd98efbe465140239f5 100644 (file)
--- a/rfc3676.c
+++ b/rfc3676.c
@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "body.h"
 #include "globals.h"

diff --git a/rfc822.c b/rfc822.c
index dd4c2e6c725061b8c55b1ae2dbe633607dbfc1b8..3d604c0e824b72dd019c5f8ab533b17c93f46831 100644 (file)
--- a/rfc822.c
+++ b/rfc822.c
@@ -53,7 +53,7 @@
 #include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "rfc822.h"
 #include "mutt_idna.h"
 

diff --git a/rfc822.h b/rfc822.h
index 55e6bd3ab741dd71d8d2386c68c58296c59ad8c1..cc63232ddd2f4b4aa5a842f6867e610e7d61ca17 100644 (file)
--- a/rfc822.h
+++ b/rfc822.h
@@ -27,7 +27,7 @@
 #include <stddef.h>
 #include <stdbool.h>
 #include "address.h"
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 
 /**
  * enum AddressError - possible values for RFC822Error

diff --git a/safe_asprintf.c b/safe_asprintf.c
index 77d110804741d6358ad75378f24942a3f7d53d7f..f9e35ef7cd5f17b46c314b96ff804f628144fe2e 100644 (file)
--- a/safe_asprintf.c
+++ b/safe_asprintf.c
@@ -22,7 +22,7 @@
 
 #include <stdarg.h>
 #include <stdio.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 
 /* NOTE: Currently there is no check in configure.ac for vasprintf(3).  the
  * undefined behavior of the error condition makes it difficult to write a safe

diff --git a/score.c b/score.c
index 44f501d8cf0e0f126ce819dd03fc117526fadab2..c9b5db88cba67ab34d6e051b9a0aa92e23e6412d 100644 (file)
--- a/score.c
+++ b/score.c
@@ -23,7 +23,7 @@
 #include "config.h"
 #include <stdlib.h>
 #include <string.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "context.h"
 #include "globals.h"

diff --git a/send.c b/send.c
index 7f7a1351cce23b4b9a3d07ccc00c366d73baed38..c18b4ad8bd69af76e4260d0fabdd1154bc458b2f 100644 (file)
--- a/send.c
+++ b/send.c
@@ -32,7 +32,7 @@
 #include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "address.h"
 #include "alias.h"

diff --git a/sendlib.c b/sendlib.c
index ec00ad4d1e77e95ba321c3ed3a3d1220a9977dcb..fa299755150a77f4caeb431e6a80b1da720588c4 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -38,7 +38,7 @@
 #include <time.h>
 #include <unistd.h>
 #include <wchar.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "address.h"
 #include "body.h"

diff --git a/sidebar.c b/sidebar.c
index 3eda364afcf83b72bf3fa4c007d9edddd720af51..3681e51a60e3de8c38d3b1e240e573fc4c4ce525 100644 (file)
--- a/sidebar.c
+++ b/sidebar.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "sidebar.h"
 #include "buffy.h"

diff --git a/signal.c b/signal.c
index e6fb416419469d8efaff414d88e42eaa1a0aab3e..0f5ebb302deb1a41da7e644c568854a2292605c9 100644 (file)
--- a/signal.c
+++ b/signal.c
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "globals.h"
 #include "mutt_curses.h"
 #include "options.h"

diff --git a/smtp.c b/smtp.c
index d308b3940f56377f1ebb81c12bdd8da097c67261..e4aa274608e70ccd264327eb28aad45f8865ddaf 100644 (file)
--- a/smtp.c
+++ b/smtp.c
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "conn/conn.h"
 #include "mutt.h"
 #include "address.h"

diff --git a/sort.c b/sort.c
index 2ebb10a06b5c140272a72f75ccd620b2fbc27e2a..e51a4c6be203649ddfc1b0ad6384af697db7fac4 100644 (file)
--- a/sort.c
+++ b/sort.c
@@ -23,7 +23,7 @@
 #include "config.h"
 #include <stdlib.h>
 #include <string.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "sort.h"
 #include "address.h"

diff --git a/sort.h b/sort.h
index 6b3a62295d52f372fb02dc192e135649f0be5c9b..18c66a7210e60fb9ffe13f70db16ed9c55537d78 100644 (file)
--- a/sort.h
+++ b/sort.h
@@ -24,7 +24,7 @@
 #define _MUTT_SORT_H
 
 #include "where.h"
-#include "lib/mapping.h"
+#include "mutt/mapping.h"
 
 struct Address;
 struct Context;

diff --git a/status.c b/status.c
index 480a817467544df78780db598d4995bdaa58e55b..10f77d1047b4b387a1312826da1c65432ec4b619 100644 (file)
--- a/status.c
+++ b/status.c
@@ -22,7 +22,7 @@
 
 #include "config.h"
 #include <stdio.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "context.h"
 #include "format_flags.h"
 #include "globals.h"

diff --git a/thread.c b/thread.c
index 41bdfaceebb63a7e5a5d2db896b6b990a0cfa753..fad10c8feafc523b1b700b0f86de50cf54d194ef 100644 (file)
--- a/thread.c
+++ b/thread.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "thread.h"
 #include "body.h"

diff --git a/url.c b/url.c
index 87c0451e69f870ed70beea5b2d25fa59cbaf5108..a905650080174d5fba7869e6dcf38b8a78066b4c 100644 (file)
--- a/url.c
+++ b/url.c
@@ -28,7 +28,7 @@
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #include "mutt.h"
 #include "url.h"
 #include "envelope.h"

diff --git a/url.h b/url.h
index 2c1051d10fd304e47298693b26f4db23de3ba645..7cebe6768dac559400102ec5e6e068ee8118a8f4 100644 (file)
--- a/url.h
+++ b/url.h
@@ -22,7 +22,7 @@
 #define _MUTT_URL_H
 
 #include <stddef.h>
-#include "lib/queue.h"
+#include "mutt/queue.h"
 
 struct Envelope;
 

diff --git a/version.c b/version.c
index a46668fe2c0d5751ad269412a978d6a74a2d42cf..e3a2f3044a43d04060a2702c40e91c56b0d80bb8 100644 (file)
--- a/version.c
+++ b/version.c
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <sys/utsname.h>
 #include <unistd.h>
-#include "lib/lib.h"
+#include "mutt/mutt.h"
 #ifdef HAVE_STRINGPREP_H
 #include <stringprep.h>
 #elif defined(HAVE_IDN_STRINGPREP_H)