Resolve the circular dependency of libmh on libmts on libmh. The

[mmh] / uip / conflict.c

diff --git a/uip/conflict.c b/uip/conflict.c
index 29a12e7..dde0602 100644 (file)
--- a/uip/conflict.c
+++ b/uip/conflict.c
@@ -8,7 +8,7 @@
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/aliasbr.h>
-#include <zotnet/mts/mts.h>
+#include <h/mts.h>
 #include <grp.h>
 #include <pwd.h>
 
@@ -31,7 +31,7 @@ static struct swit switches[] = {
 #define VERSIONSW      2
     { "version", 0 },
 #define        HELPSW         3
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -134,7 +134,7 @@ main (int argc, char **argv)
 #endif /* UCI */
     maildrops ();
 
-    done (0);
+    return done (0);
 }