diff options
| author | steve <steve@FreeBSD.org> | 1997-06-29 19:00:29 +0000 |
|---|---|---|
| committer | steve <steve@FreeBSD.org> | 1997-06-29 19:00:29 +0000 |
| commit | 0d992ff3138ae20de7a6f94dd7a46d15618900ad (patch) | |
| tree | b7f9efb7b5727705d2c745d83fd97780dc95e4c9 /libexec/rbootd/conf.c | |
| parent | 8d3c561e32236d0061cc1de5ec7a4224d7ec85f4 (diff) | |
| download | FreeBSD-src-0d992ff3138ae20de7a6f94dd7a46d15618900ad.zip FreeBSD-src-0d992ff3138ae20de7a6f94dd7a46d15618900ad.tar.gz | |
Merge conflicts and make this compile -Wall clean.
Diffstat (limited to 'libexec/rbootd/conf.c')
| -rw-r--r-- | libexec/rbootd/conf.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libexec/rbootd/conf.c b/libexec/rbootd/conf.c index 51ad23b..58da9f0 100644 --- a/libexec/rbootd/conf.c +++ b/libexec/rbootd/conf.c @@ -1,5 +1,3 @@ -/* $NetBSD: conf.c,v 1.5 1995/10/06 05:12:13 thorpej Exp $ */ - /* * Copyright (c) 1988, 1992 The University of Utah and the Center * for Software Science (CSS). @@ -41,14 +39,14 @@ * SUCH DAMAGE. * * from: @(#)conf.c 8.1 (Berkeley) 6/4/93 + * $Id$ * * From: Utah Hdr: conf.c 3.1 92/07/06 * Author: Jeff Forys, University of Utah CSS */ #ifndef lint -/*static char sccsid[] = "@(#)conf.c 8.1 (Berkeley) 6/4/93";*/ -static char rcsid[] = "$NetBSD: conf.c,v 1.5 1995/10/06 05:12:13 thorpej Exp $"; +static const char sccsid[] = "@(#)conf.c 8.1 (Berkeley) 6/4/93"; #endif /* not lint */ #include <sys/param.h> |
