Clean up dependencies: remailer.h is no longer included by mutt.h,

and the mix_* prototypes can once again go to remailer.h.

diff --git a/mutt.h b/mutt.h
index d9f3514944a737611cf7a205d7a17f31f97d9d65..a8f31d22a6d5f0e8dcd4be96976877c92a170662 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -48,10 +48,6 @@
 # define N_(a) a
 #endif
 
-#ifdef MIXMASTER
-# include "remailer.h"
-#endif
-
 #ifdef SUBVERSION
 # define MUTT_VERSION (VERSION SUBVERSION)
 #else  

diff --git a/protos.h b/protos.h
index 96142c26e63e3dbd28fdb80d7a7b6045bf5ec42e..531dac7af5aac1db11e087362d06286d724535bf 100644 (file)
--- a/protos.h
+++ b/protos.h
@@ -434,14 +434,3 @@ void ci_bounce_message (HEADER *, int *);
 void ci_send_message (int, HEADER *, char *, CONTEXT *, HEADER *);
 
 
-
-#ifdef MIXMASTER
-/* mixmaster support - must go here so we get the
- * type definitions in the right order.
- */
-
-
-int mix_send_message (LIST *, const char *);
-int mix_check_message (HEADER *msg);
-void mix_make_chain (LIST **, int *);
-#endif

diff --git a/remailer.h b/remailer.h
index 57050ec91c5c424af967ae8d354ad16c22baf768..b722b082ea7714f38f1609dccdf34134ddd1f214 100644 (file)
--- a/remailer.h
+++ b/remailer.h
@@ -55,7 +55,9 @@ struct mixchain
 
 typedef struct mixchain MIXCHAIN;
 
-/* function prototypes are in protos.h */
+int mix_send_message (LIST *, const char *);
+int mix_check_message (HEADER *msg);
+void mix_make_chain (LIST **, int *);
 
 #endif /* MIXMASTER */
 

diff --git a/send.c b/send.c
index c9fded20424e2146144fe1883b7c540d8ad68a25..592dd361bbcd1a097c6134209c385cc8bd3e3260 100644 (file)
--- a/send.c
+++ b/send.c
@@ -38,6 +38,9 @@
 #include "pgp.h"
 #endif
 
+#ifdef MIXMASTER
+#include "remailer.h"
+#endif
 
 
 static void append_signature (FILE *f)