diff options
| author | wpaul <wpaul@FreeBSD.org> | 1997-05-28 04:38:30 +0000 |
|---|---|---|
| committer | wpaul <wpaul@FreeBSD.org> | 1997-05-28 04:38:30 +0000 |
| commit | fd6d99f49e14785b3c84eaf12c9ae787ee93700d (patch) | |
| tree | e1853e38f0b1243daa3c8d027f2bf1aff3adaac8 /include/rpcsvc/yppasswd.x | |
| parent | 4b109a080d8618ef145e3a1ac1665ac19b50d1be (diff) | |
| download | FreeBSD-src-fd6d99f49e14785b3c84eaf12c9ae787ee93700d.zip FreeBSD-src-fd6d99f49e14785b3c84eaf12c9ae787ee93700d.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'include/rpcsvc/yppasswd.x')
| -rw-r--r-- | include/rpcsvc/yppasswd.x | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/rpcsvc/yppasswd.x b/include/rpcsvc/yppasswd.x index b304fda..c1505b3 100644 --- a/include/rpcsvc/yppasswd.x +++ b/include/rpcsvc/yppasswd.x @@ -36,7 +36,7 @@ %#ifndef lint %/*static char sccsid[] = "from: @(#)yppasswd.x 1.1 87/04/13 Copyr 1987 Sun Micro";*/ %/*static char sccsid[] = "from: @(#)yppasswd.x 2.1 88/08/01 4.0 RPCSRC";*/ -%static char rcsid[] = "$Id$"; +%static char rcsid[] = "$Id: yppasswd.x,v 1.1 1994/08/04 19:01:57 wollman Exp $"; %#endif /* not lint */ #endif @@ -67,3 +67,8 @@ struct yppasswd { }; +#ifdef RPC_HDR +%#include <sys/cdefs.h> +%extern int _yppasswd __P(( char * , struct x_passwd * )); +%#define yppasswd(x,y) _yppasswd(x,y) +#endif |
