diff options
author | obrien <obrien@FreeBSD.org> | 1999-09-15 05:45:17 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 1999-09-15 05:45:17 +0000 |
commit | 5c1a3647e5e952726219b96156a3eebfa5789118 (patch) | |
tree | a1a7d61cd30dc7bc80b9778e62052c5eee5e3d67 /contrib/amd/mk-amd-map | |
parent | e2c605abd09c68a264a51f01f9362d297976ea63 (diff) | |
download | FreeBSD-src-5c1a3647e5e952726219b96156a3eebfa5789118.zip FreeBSD-src-5c1a3647e5e952726219b96156a3eebfa5789118.tar.gz |
Fix conflicts.
Diffstat (limited to 'contrib/amd/mk-amd-map')
-rw-r--r-- | contrib/amd/mk-amd-map/mk-amd-map.8 | 5 | ||||
-rw-r--r-- | contrib/amd/mk-amd-map/mk-amd-map.c | 15 |
2 files changed, 6 insertions, 14 deletions
diff --git a/contrib/amd/mk-amd-map/mk-amd-map.8 b/contrib/amd/mk-amd-map/mk-amd-map.8 index e22e818..99f93e1 100644 --- a/contrib/amd/mk-amd-map/mk-amd-map.8 +++ b/contrib/amd/mk-amd-map/mk-amd-map.8 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997-1998 Erez Zadok +.\" Copyright (c) 1997-1999 Erez Zadok .\" Copyright (c) 1993 Jan-Simon Pendry .\" Copyright (c) 1993 .\" The Regents of the University of California. All rights reserved. @@ -33,7 +33,8 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)mk-amd-map.8 8.1 (Berkeley) 6/28/93 -.\" $Id: mk-amd-map.8,v 1.1.1.1 1998/08/23 22:07:21 obrien Exp $ +.\" $Id: mk-amd-map.8,v 1.2 1999/01/10 21:54:41 ezk Exp $ +.\" $FreeBSD$ .\" .Dd June 28, 1993 .Dt MK-AMD-MAP 8 diff --git a/contrib/amd/mk-amd-map/mk-amd-map.c b/contrib/amd/mk-amd-map/mk-amd-map.c index 4806297..755d5bf 100644 --- a/contrib/amd/mk-amd-map/mk-amd-map.c +++ b/contrib/amd/mk-amd-map/mk-amd-map.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-1998 Erez Zadok + * Copyright (c) 1997-1999 Erez Zadok * Copyright (c) 1990 Jan-Simon Pendry * Copyright (c) 1990 Imperial College of Science, Technology & Medicine * Copyright (c) 1990 The Regents of the University of California. @@ -38,7 +38,8 @@ * * %W% (Berkeley) %G% * - * $Id: mk-amd-map.c,v 1.5 1998/11/14 03:13:32 obrien Exp $ + * $Id: mk-amd-map.c,v 1.4 1999/02/04 07:24:50 ezk Exp $ + * $FreeBSD$ */ /* @@ -50,16 +51,6 @@ #endif /* HAVE_CONFIG_H */ #include <am_defs.h> -/* dummy variables */ -#if 0 -char *progname; -pid_t mypid; -serv_state amd_state; -int foreground, orig_umask; -int debug_flags; -#endif -char hostname[MAXHOSTNAMELEN]; - /* (libdb version 2) uses .db extensions but an old dbm API */ /* check for libgdbm to distinguish it from linux systems */ #if defined(DBM_SUFFIX) && !defined(HAVE_LIBGDBM) |