diff options
| author | obrien <obrien@FreeBSD.org> | 1999-01-13 20:04:00 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 1999-01-13 20:04:00 +0000 |
| commit | 44885905a041e4fad7e29a53f111f6fb16402d07 (patch) | |
| tree | b1a90e3c85c48712843356ffffdb58a8e388e44f /contrib/amd/mk-amd-map | |
| parent | 650a536e8ff28f166a48818f45c026ae9990d1c5 (diff) | |
| download | FreeBSD-src-44885905a041e4fad7e29a53f111f6fb16402d07.zip FreeBSD-src-44885905a041e4fad7e29a53f111f6fb16402d07.tar.gz | |
Fix conflicts.
Diffstat (limited to 'contrib/amd/mk-amd-map')
| -rw-r--r-- | contrib/amd/mk-amd-map/mk-amd-map.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/contrib/amd/mk-amd-map/mk-amd-map.c b/contrib/amd/mk-amd-map/mk-amd-map.c index 1c2640f..4806297 100644 --- a/contrib/amd/mk-amd-map/mk-amd-map.c +++ b/contrib/amd/mk-amd-map/mk-amd-map.c @@ -17,7 +17,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: + * must display the following acknowledgment: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: mk-amd-map.c,v 1.4 1998/08/27 07:25:25 obrien Exp $ + * $Id: mk-amd-map.c,v 1.5 1998/11/14 03:13:32 obrien Exp $ */ /* @@ -51,10 +51,14 @@ #include <am_defs.h> /* dummy variables */ -char hostname[MAXHOSTNAMELEN]; -int orig_umask, foreground, debug_flags; +#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 */ |
