From: Richard Russon <rich@flatcap.org>
Date: Thu, 12 Jul 2018 22:16:29 +0000 (+0100)
Subject: fix some definitions
X-Git-Tag: 2019-10-25~757^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8b15b25bc34f114ffe3bede7053f9505539f8cc7;p=neomutt

fix some definitions
---

diff --git a/conn/conn_raw.c b/conn/conn_raw.c
index 02b67fd06..cc1b8a5c6 100644
--- a/conn/conn_raw.c
+++ b/conn/conn_raw.c
@@ -49,9 +49,6 @@
 #include "options.h"
 #include "protos.h"
 
-/* These Config Variables are only used in conn/conn_raw.c */
-extern bool UseIpv6;
-
 /**
  * socket_connect - set up to connect to a socket fd
  * @param fd File descriptor to connect with
diff --git a/history.c b/history.c
index e494d14aa..dbb767877 100644
--- a/history.c
+++ b/history.c
@@ -88,10 +88,10 @@
 #include "protos.h"
 
 /* These Config Variables are only used in history.c */
-short History;
-char *HistoryFile;
-bool HistoryRemoveDups;
-short SaveHistory;
+short History;          /**< Number of history entries stored in memory */
+char *HistoryFile;      /**< File in which to store all the histories */
+bool HistoryRemoveDups; /**< Remove duplicate history entries */
+short SaveHistory; /**< Number of history entries, per category, stored on disk */
 
 #define HC_FIRST HC_CMD
 
@@ -117,11 +117,6 @@ static const struct Mapping HistoryHelp[] = {
 
 /* global vars used for the string-history routines */
 
-short History;          /**< Number of history entries stored in memory */
-char *HistoryFile;      /**< File in which to store all the histories */
-bool HistoryRemoveDups; /**< Remove duplicate history entries */
-short SaveHistory; /**< Number of history entries, per category, stored on disk */
-
 static struct History Histories[HC_LAST];
 static int OldSize = 0;
 
diff --git a/main.c b/main.c
index a5754e602..3dfc1722a 100644
--- a/main.c
+++ b/main.c
@@ -81,9 +81,6 @@
 #include "nntp/nntp.h"
 #endif
 
-/* These Config Variables are only used in main.c */
-extern bool ResumeEditedDraftFiles;
-
 #define MUTT_IGNORE (1 << 0)  /* -z */
 #define MUTT_BUFFY (1 << 1)   /* -Z */
 #define MUTT_NOSYSRC (1 << 2) /* -n */
diff --git a/remailer.c b/remailer.c
index 6b4013690..a304fa1c2 100644
--- a/remailer.c
+++ b/remailer.c
@@ -49,6 +49,11 @@
 char *MixEntryFormat;
 char *Mixmaster;
 
+#define MIX_CAP_COMPRESS (1 << 0)
+#define MIX_CAP_MIDDLEMAN (1 << 1)
+#define MIX_CAP_NEWSPOST (1 << 2)
+#define MIX_CAP_NEWSMAIL (1 << 3)
+
 /**
  * struct Coord - Screen coordinates
  */
diff --git a/remailer.h b/remailer.h
index fde04af3f..714149bc4 100644
--- a/remailer.h
+++ b/remailer.h
@@ -34,11 +34,6 @@ struct Header;
 extern char *MixEntryFormat;
 extern char *Mixmaster;
 
-#define MIX_CAP_COMPRESS  (1 << 0)
-#define MIX_CAP_MIDDLEMAN (1 << 1)
-#define MIX_CAP_NEWSPOST  (1 << 2)
-#define MIX_CAP_NEWSMAIL  (1 << 3)
-
 /* Mixmaster's maximum chain length.  Don't change this. */
 
 #define MAXMIXES 19