summaryrefslogtreecommitdiffstats
path: root/contrib/sendmail/mail.local
diff options
context:
space:
mode:
authorgshapiro <gshapiro@FreeBSD.org>2007-04-09 01:44:16 +0000
committergshapiro <gshapiro@FreeBSD.org>2007-04-09 01:44:16 +0000
commit84a4aaabc654a5912f1d321b0ef7a20746f4c371 (patch)
treeee9c26407a2442d1c45fb8592df563df0e5a520d /contrib/sendmail/mail.local
parent97853bac963c5d3bed1b2cc8456b52dc100a3a16 (diff)
downloadFreeBSD-src-84a4aaabc654a5912f1d321b0ef7a20746f4c371.zip
FreeBSD-src-84a4aaabc654a5912f1d321b0ef7a20746f4c371.tar.gz
Resolve conflicts from sendmail 8.14.1 import
Diffstat (limited to 'contrib/sendmail/mail.local')
-rw-r--r--contrib/sendmail/mail.local/mail.local.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/contrib/sendmail/mail.local/mail.local.c b/contrib/sendmail/mail.local/mail.local.c
index b5ccd5b..cba40a7 100644
--- a/contrib/sendmail/mail.local/mail.local.c
+++ b/contrib/sendmail/mail.local/mail.local.c
@@ -20,7 +20,7 @@ SM_IDSTR(copyright,
Copyright (c) 1990, 1993, 1994\n\
The Regents of the University of California. All rights reserved.\n")
-SM_IDSTR(id, "@(#)$Id: mail.local.c,v 8.253 2004/11/01 20:42:42 ca Exp $")
+SM_IDSTR(id, "@(#)$Id: mail.local.c,v 8.254 2006/10/12 22:23:45 ca Exp $")
#include <stdlib.h>
#include <sm/errstring.h>
@@ -177,6 +177,8 @@ const char *hashname __P((char *));
#endif /* HASHSPOOL */
+static void sm_exit __P((int));
+
static void
sm_exit(status)
int status;
OpenPOWER on IntegriCloud