Return type of (*done)() changed to void. default_done() replaced by

[mmh] / uip / conflict.c

diff --git a/uip/conflict.c b/uip/conflict.c
index 1713b15b1899e5b01827cda24465bd4ef7b32be3..8247ff0cf32912e97cdc6ce78849d8e77ecd18bd 100644 (file)
--- a/uip/conflict.c
+++ b/uip/conflict.c
@@ -139,7 +139,8 @@ main (int argc, char **argv)
 #endif /* UCI */
     maildrops ();
 
 #endif /* UCI */
     maildrops ();
 

-    return done (0);
+    done (0);
+    return 1;

 }
 
 
 }