X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=browser.h;h=721889b4594d534cfef52c41e8bced7d9cb1e063;hp=20aedc96a63200676b27f6cf4a64257adc81ce72;hb=5dcac54e5db074dc4572f843666c7f7acaf2d109;hpb=25bf57d598476b329536fa3f748cc0c529fef6bd

diff --git a/browser.h b/browser.h
index 20aedc9..721889b 100644
--- a/browser.h
+++ b/browser.h
@@ -11,7 +11,7 @@
 #define _BROWSER_H 1
 
 #ifdef USE_NNTP
-#include "nntp/nntp.h"
+#include "nntp.h"
 #endif
 
 struct folder_file {
@@ -24,30 +24,26 @@ struct folder_file {
   char *desc;
 
   unsigned short new;
-#ifdef USE_IMAP
   char delim;
 
   unsigned imap:1;
   unsigned selectable:1;
   unsigned inferiors:1;
-#endif
 #ifdef USE_NNTP
-  NNTP_DATA *nd;
+  nntp_data_t *nd;
 #endif
   unsigned tagged:1;
 };
 
 struct browser_state {
   struct folder_file *entry;
-  unsigned int entrylen;        /* number of real entries */
-  unsigned int entrymax;        /* max entry */
-#ifdef USE_IMAP
+  int entrylen;        /* number of real entries */
+  int entrymax;        /* max entry */
   short imap_browse;
   char *folder;
   unsigned noselect:1;
   unsigned marked:1;
   unsigned unmarked:1;
-#endif
 };
 
 #endif /* _BROWSER_H */