Move the folder status bits and testing macros into folders.h

src/folders.h

@@ -29,6 +29,23 @@ bit 	use
 6	moderated folder
 7	-
 */
+#define MWFOLDR_ACTIVE    0
+#define MWFOLDR_RUNREG    1
+#define MWFOLDR_WUNREG    2
+#define MWFOLDR_RREG      3
+#define MWFOLDR_WREG      4
+#define MWFOLDR_PRIVATE   5
+#define MWFOLDR_MODERATED 6
+/* Dummy for limit checking */
+#define MWFOLDR_SIZE      7
+
+#define f_active(stat)    (stat & (1 << MWFOLDR_ACTIVE))
+#define f_r_unreg(stat)   (stat & (1 << MWFOLDR_RUNREG))
+#define f_w_unreg(stat)   (stat & (1 << MWFOLDR_WUNREG))
+#define f_r_reg(stat)     (stat & (1 << MWFOLDR_RREG))
+#define f_w_reg(stat)     (stat & (1 << MWFOLDR_WREG))
+#define f_private(stat)   (stat & (1 << MWFOLDR_PRIVATE))
+#define f_moderated(stat) (stat & (1 << MWFOLDR_MODERATED))
 
 int openfolderfile(int mode);
 int nofolders(void);

src/perms.h

@@ -24,21 +24,4 @@ char folder_groups(const char *string, char stat);
 void set_subscribe(struct person *user,int folder,int status);
 int get_subscribe(struct person *user, int folder);
 
-#define MWFOLDR_ACTIVE    0
-#define MWFOLDR_RUNREG    1
-#define MWFOLDR_WUNREG    2
-#define MWFOLDR_RREG      3
-#define MWFOLDR_WREG      4
-#define MWFOLDR_PRIVATE   5
-#define MWFOLDR_MODERATED 6
-#define MWFOLDR_SIZE      7 /* Dummy for limit checking */
-
-#define f_active(stat)    (stat & (1 << MWFOLDR_ACTIVE))
-#define f_r_unreg(stat)   (stat & (1 << MWFOLDR_RUNREG))
-#define f_w_unreg(stat)   (stat & (1 << MWFOLDR_WUNREG))
-#define f_r_reg(stat)     (stat & (1 << MWFOLDR_RREG))
-#define f_w_reg(stat)     (stat & (1 << MWFOLDR_WREG))
-#define f_private(stat)   (stat & (1 << MWFOLDR_PRIVATE))
-#define f_moderated(stat) (stat & (1 << MWFOLDR_MODERATED))
-
 #endif