aboutsummaryrefslogtreecommitdiff
path: root/contrib/amd/amd/amd.c
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>1998-11-14 03:13:33 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>1998-11-14 03:13:33 +0000
commite2ee784d30b95f75566d7d57d1e0ac3f82b59566 (patch)
treef48358a5b393f67f42272b55623778a72a7f22d1 /contrib/amd/amd/amd.c
parent4c5751da9fcb1b967a1865a5b2b12ad79f9a2f4e (diff)
downloadsrc-e2ee784d30b95f75566d7d57d1e0ac3f82b59566.tar.gz
src-e2ee784d30b95f75566d7d57d1e0ac3f82b59566.zip
Clean up conflicts.
Notes
Notes: svn path=/head/; revision=41145
Diffstat (limited to 'contrib/amd/amd/amd.c')
-rw-r--r--contrib/amd/amd/amd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/amd/amd/amd.c b/contrib/amd/amd/amd.c
index 3740529f0c99..2ab95aabff69 100644
--- a/contrib/amd/amd/amd.c
+++ b/contrib/amd/amd/amd.c
@@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
- * $Id: amd.c,v 1.1.1.1 1998/08/23 22:07:20 obrien Exp $
+ * $Id: amd.c,v 1.2 1998/08/23 22:52:08 obrien Exp $
*
*/
@@ -57,8 +57,8 @@ struct amu_global_options gopt; /* where global options are stored */
char pid_fsname[16 + MAXHOSTNAMELEN]; /* "kiska.southseas.nz:(pid%d)" */
char *progname; /* "amd" */
char *hostdomain = "unknown.domain";
-char hostname[MAXHOSTNAMELEN + 1] = "localhost"; /* Hostname */
-char hostd[2 * MAXHOSTNAMELEN + 1]; /* Host+domain */
+char hostname[MAXHOSTNAMELEN + 1] = "localhost"; /* Hostname */
+char hostd[2 * MAXHOSTNAMELEN + 1]; /* Host+domain */
char *endian = ARCH_ENDIAN; /* Big or Little endian */
char *cpu = HOST_CPU; /* CPU type */
char *PrimNetName; /* name of primary network */