Date: Mon, 14 Apr 1997 16:32:38 +0200 From: Ollivier Robert <roberto@eurocontrol.fr> To: "FreeBSD Current Users' list" <freebsd-current@FreeBSD.ORG> Subject: undelete(2) in unistd.h conflicts with mail/extern.h Message-ID: <19970414163238.59096@caerdonn.eurocontrol.fr>
next in thread | raw e-mail | index | archive | help
The declaration of undelete(2) conflicts with usr.bin/mail/extern.h
declaration of undelete() (the function may be found in cmd2.c). I've
renamed it to mundelete in mail and here is a patch:
Index: cmd2.c
===================================================================
RCS file: /home/ncvs/src/usr.bin/mail/cmd2.c,v
retrieving revision 1.2
diff -u -2 -r1.2 cmd2.c
--- cmd2.c 1995/05/30 06:31:39 1.2
+++ cmd2.c 1997/04/14 14:26:48
@@ -346,5 +346,5 @@
*/
int
-undelete(msgvec)
+mundelete(msgvec)
int *msgvec;
{
Index: cmdtab.c
===================================================================
RCS file: /home/ncvs/src/usr.bin/mail/cmdtab.c,v
retrieving revision 1.1.1.1
diff -u -2 -r1.1.1.1 cmdtab.c
--- cmdtab.c 1994/05/27 12:32:06 1.1.1.1
+++ cmdtab.c 1997/04/14 14:27:11
@@ -59,5 +59,5 @@
"dp", deltype, W|MSGLIST, 0, MMNDEL,
"dt", deltype, W|MSGLIST, 0, MMNDEL,
- "undelete", undelete, P|MSGLIST, MDELETED,MMNDEL,
+ "undelete", mundelete, P|MSGLIST, MDELETED,MMNDEL,
"unset", unset, M|RAWLIST, 1, 1000,
"mail", sendmail, R|M|I|STRLIST, 0, 0,
Index: extern.h
===================================================================
RCS file: /home/ncvs/src/usr.bin/mail/extern.h,v
retrieving revision 1.1.1.1
diff -u -2 -r1.1.1.1 extern.h
--- extern.h 1994/05/27 12:32:07 1.1.1.1
+++ extern.h 1997/04/14 14:27:20
@@ -240,5 +240,5 @@
int type __P((int *));
int type1 __P((int *, int, int));
-int undelete __P((int *));
+int mundelete __P((int *));
void unmark __P((int));
char **unpack __P((struct name *));
This is the first "make world" I try since 13/02/97. CVS tree CVSup-ed two
hours ago.
--
Ollivier ROBERT -=- Eurocontrol EEC/TS -=- Ollivier.Robert@eurocontrol.fr
FreeBSD caerdonn.eurocontrol.fr 3.0-CURRENT #1: Wed Apr 9 15:05:08 CEST 1997
roberto@caerdonn.eurocontrol.fr:/src/src/sys/compile/CAERDONN2 i386
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19970414163238.59096>