Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/nmh

[nmh] / uip / conflict.c

diff --git a/uip/conflict.c b/uip/conflict.c
index d8c4566..a43c70e 100644 (file)
--- a/uip/conflict.c
+++ b/uip/conflict.c
@@ -366,7 +366,7 @@ setup (void)
                        close (fd);
                    }
                execlp (mailproc, r1bindex (mailproc, '/'),
-                       mail, "-subject", invo_name, NULL);
+                       mail, "-subject", invo_name, (void *) NULL);
                adios (mailproc, "unable to exec ");
 
            default: