summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>2002-03-14 20:31:32 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>2002-03-14 20:31:32 +0000
commit664594592b027192aadee83827fa39d430c954d0 (patch)
tree83df829c370f8eb63a310ab1cd55864e752ccd5c
parent5d9413e62b10c038c2061d9b5cc7f27ea22b1653 (diff)
remove ambiguity in version,ostype,osversion,osrelease and their constanity, they are and declarre 'em accordingly also removing private externies of those
-rw-r--r--sys/arch/amiga/amiga/machdep.c3
-rw-r--r--sys/arch/hp300/hp300/machdep.c3
-rw-r--r--sys/arch/i386/i386/machdep.c3
-rw-r--r--sys/arch/mvme68k/mvme68k/machdep.c3
-rw-r--r--sys/arch/sun3/sun3/machdep.c3
-rw-r--r--sys/arch/vax/vax/machdep.c3
-rw-r--r--sys/compat/common/kern_info_09.c6
-rw-r--r--sys/compat/common/kern_info_43.c4
-rw-r--r--sys/compat/hpux/hpux_compat.c5
-rw-r--r--sys/compat/ibcs2/ibcs2_stat.c4
-rw-r--r--sys/compat/linux/linux_misc.c9
-rw-r--r--sys/compat/osf1/osf1_misc.c4
-rw-r--r--sys/compat/sunos/sunos_misc.c4
-rw-r--r--sys/compat/svr4/svr4_stat.c12
-rw-r--r--sys/compat/ultrix/ultrix_misc.c4
-rw-r--r--sys/conf/newvers.sh12
-rw-r--r--sys/kern/init_main.c4
-rw-r--r--sys/kern/kern_sysctl.c3
-rw-r--r--sys/miscfs/kernfs/kernfs_vnops.c13
-rw-r--r--sys/sys/systm.h9
20 files changed, 52 insertions, 59 deletions
diff --git a/sys/arch/amiga/amiga/machdep.c b/sys/arch/amiga/amiga/machdep.c
index 3f26e871dbc..431008ce8a2 100644
--- a/sys/arch/amiga/amiga/machdep.c
+++ b/sys/arch/amiga/amiga/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.67 2002/03/14 01:26:28 millert Exp $ */
+/* $OpenBSD: machdep.c,v 1.68 2002/03/14 20:31:30 mickey Exp $ */
/* $NetBSD: machdep.c,v 1.95 1997/08/27 18:31:17 is Exp $ */
/*
@@ -576,7 +576,6 @@ setregs(p, pack, stack, retval)
* Info for CTL_HW
*/
char cpu_model[120];
-extern char version[];
#if defined(M68060)
int m68060_pcr_init = 0x21; /* make this patchable */
diff --git a/sys/arch/hp300/hp300/machdep.c b/sys/arch/hp300/hp300/machdep.c
index 2c9728b00a6..60766640803 100644
--- a/sys/arch/hp300/hp300/machdep.c
+++ b/sys/arch/hp300/hp300/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.79 2002/03/14 01:26:31 millert Exp $ */
+/* $OpenBSD: machdep.c,v 1.80 2002/03/14 20:31:30 mickey Exp $ */
/* $NetBSD: machdep.c,v 1.121 1999/03/26 23:41:29 mycroft Exp $ */
/*
@@ -505,7 +505,6 @@ setregs(p, pack, stack, retval)
* Info for CTL_HW
*/
char cpu_model[120];
-extern char version[];
/*
* Text description of models we support, indexed by machineid.
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index c5a0878c987..4b5087a449d 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.199 2002/03/14 16:52:11 mickey Exp $ */
+/* $OpenBSD: machdep.c,v 1.200 2002/03/14 20:31:31 mickey Exp $ */
/* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */
/*-
@@ -622,7 +622,6 @@ setup_buffers(maxaddr)
* Info for CTL_HW
*/
char cpu_model[120];
-extern char version[];
/*
* Note: these are just the ones that may not have a cpuid instruction.
diff --git a/sys/arch/mvme68k/mvme68k/machdep.c b/sys/arch/mvme68k/mvme68k/machdep.c
index d6c7ee3c020..99d6d9ec766 100644
--- a/sys/arch/mvme68k/mvme68k/machdep.c
+++ b/sys/arch/mvme68k/mvme68k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.66 2002/03/14 03:15:56 millert Exp $ */
+/* $OpenBSD: machdep.c,v 1.67 2002/03/14 20:31:31 mickey Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -471,7 +471,6 @@ setregs(p, pack, stack, retval)
* Info for CTL_HW
*/
char cpu_model[120];
-extern char version[];
int cputyp;
int cpuspeed;
diff --git a/sys/arch/sun3/sun3/machdep.c b/sys/arch/sun3/sun3/machdep.c
index 68eef454519..26ffbcb7ac8 100644
--- a/sys/arch/sun3/sun3/machdep.c
+++ b/sys/arch/sun3/sun3/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.53 2002/03/14 03:16:01 millert Exp $ */
+/* $OpenBSD: machdep.c,v 1.54 2002/03/14 20:31:31 mickey Exp $ */
/* $NetBSD: machdep.c,v 1.77 1996/10/13 03:47:51 christos Exp $ */
/*
@@ -93,7 +93,6 @@
#include <machine/reg.h>
extern char *cpu_string;
-extern char version[];
extern short exframesize[];
int physmem;
diff --git a/sys/arch/vax/vax/machdep.c b/sys/arch/vax/vax/machdep.c
index 7c7ef2d476d..fbd88328bc6 100644
--- a/sys/arch/vax/vax/machdep.c
+++ b/sys/arch/vax/vax/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.55 2002/03/14 01:26:48 millert Exp $ */
+/* $OpenBSD: machdep.c,v 1.56 2002/03/14 20:31:31 mickey Exp $ */
/* $NetBSD: machdep.c,v 1.108 2000/09/13 15:00:23 thorpej Exp $ */
/*
@@ -174,7 +174,6 @@ void
cpu_startup()
{
caddr_t v;
- extern char version[];
int base, residual, i, sz;
vm_offset_t minaddr, maxaddr;
vm_size_t size;
diff --git a/sys/compat/common/kern_info_09.c b/sys/compat/common/kern_info_09.c
index 1c84d9e1a13..27b44bef1f8 100644
--- a/sys/compat/common/kern_info_09.c
+++ b/sys/compat/common/kern_info_09.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_info_09.c,v 1.8 2001/11/06 19:53:17 miod Exp $ */
+/* $OpenBSD: kern_info_09.c,v 1.9 2002/03/14 20:31:31 mickey Exp $ */
/* $NetBSD: kern_info_09.c,v 1.5 1996/02/21 00:10:59 cgd Exp $ */
/*
@@ -114,8 +114,8 @@ compat_09_sys_uname(p, v, retval)
syscallarg(struct outsname *) name;
} */ *uap = v;
struct outsname outsname;
- char *cp, *dp, *ep;
- extern char ostype[], osrelease[];
+ const char *cp;
+ char *dp, *ep;
strncpy(outsname.sysname, ostype, sizeof(outsname.sysname));
strncpy(outsname.nodename, hostname, sizeof(outsname.nodename));
diff --git a/sys/compat/common/kern_info_43.c b/sys/compat/common/kern_info_43.c
index 387c78cf3d0..ed6928800b2 100644
--- a/sys/compat/common/kern_info_43.c
+++ b/sys/compat/common/kern_info_43.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_info_43.c,v 1.11 2001/11/06 19:53:17 miod Exp $ */
+/* $OpenBSD: kern_info_43.c,v 1.12 2002/03/14 20:31:31 mickey Exp $ */
/* $NetBSD: kern_info_43.c,v 1.5 1996/02/04 02:02:22 christos Exp $ */
/*
@@ -205,7 +205,7 @@ compat_43_sys_getkerninfo(p, v, retval)
int error, name[5];
size_t size;
- extern char ostype[], osrelease[], machine[];
+ extern char machine[];
if (SCARG(uap, size) && (error = copyin((caddr_t)SCARG(uap, size),
(caddr_t)&size, sizeof(size))))
diff --git a/sys/compat/hpux/hpux_compat.c b/sys/compat/hpux/hpux_compat.c
index 6edaff6840a..f537a2d370e 100644
--- a/sys/compat/hpux/hpux_compat.c
+++ b/sys/compat/hpux/hpux_compat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hpux_compat.c,v 1.18 2002/03/14 01:26:49 millert Exp $ */
+/* $OpenBSD: hpux_compat.c,v 1.19 2002/03/14 20:31:31 mickey Exp $ */
/* $NetBSD: hpux_compat.c,v 1.35 1997/05/08 16:19:48 mycroft Exp $ */
/*
@@ -386,8 +386,7 @@ hpux_sys_utssys(p, v, retval)
int i;
int error;
struct hpux_utsname ut;
- extern char ostype[], hostname[], osrelease[], version[];
- extern char machine[];
+ extern char hostname[], machine[];
switch (SCARG(uap, request)) {
/* uname */
diff --git a/sys/compat/ibcs2/ibcs2_stat.c b/sys/compat/ibcs2/ibcs2_stat.c
index 28bee548f1c..04534fc0eca 100644
--- a/sys/compat/ibcs2/ibcs2_stat.c
+++ b/sys/compat/ibcs2/ibcs2_stat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ibcs2_stat.c,v 1.8 2002/03/14 01:26:50 millert Exp $ */
+/* $OpenBSD: ibcs2_stat.c,v 1.9 2002/03/14 20:31:31 mickey Exp $ */
/* $NetBSD: ibcs2_stat.c,v 1.5 1996/05/03 17:05:32 christos Exp $ */
/*
@@ -259,7 +259,7 @@ ibcs2_sys_utssys(p, v, retval)
case 0: /* uname(2) */
{
struct ibcs2_utsname sut;
- extern char ostype[], machine[], osrelease[];
+ extern char machine[];
bzero(&sut, ibcs2_utsname_len);
bcopy(ostype, sut.sysname, sizeof(sut.sysname) - 1);
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index 0d72112a04a..17ed62e7b22 100644
--- a/sys/compat/linux/linux_misc.c
+++ b/sys/compat/linux/linux_misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: linux_misc.c,v 1.41 2002/03/14 01:26:50 millert Exp $ */
+/* $OpenBSD: linux_misc.c,v 1.42 2002/03/14 20:31:31 mickey Exp $ */
/* $NetBSD: linux_misc.c,v 1.27 1996/05/20 01:59:21 fvdl Exp $ */
/*
@@ -521,8 +521,7 @@ linux_sys_uname(p, v, retval)
struct linux_sys_uname_args /* {
syscallarg(struct linux_utsname *) up;
} */ *uap = v;
- extern char ostype[], hostname[], osrelease[], version[], machine[],
- domainname[];
+ extern char hostname[], machine[], domainname[];
struct linux_utsname luts;
int len;
char *cp;
@@ -558,7 +557,7 @@ linux_sys_olduname(p, v, retval)
struct linux_sys_uname_args /* {
syscallarg(struct linux_oldutsname *) up;
} */ *uap = v;
- extern char ostype[], hostname[], osrelease[], version[], machine[];
+ extern char hostname[], machine[];
struct linux_oldutsname luts;
int len;
char *cp;
@@ -587,7 +586,7 @@ linux_sys_oldolduname(p, v, retval)
struct linux_sys_uname_args /* {
syscallarg(struct linux_oldoldutsname *) up;
} */ *uap = v;
- extern char ostype[], hostname[], osrelease[], version[], machine[];
+ extern char hostname[], machine[];
struct linux_oldoldutsname luts;
int len;
char *cp;
diff --git a/sys/compat/osf1/osf1_misc.c b/sys/compat/osf1/osf1_misc.c
index 13191c7dcce..de227667a5c 100644
--- a/sys/compat/osf1/osf1_misc.c
+++ b/sys/compat/osf1/osf1_misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: osf1_misc.c,v 1.13 2000/08/12 20:46:42 ericj Exp $ */
+/* $OpenBSD: osf1_misc.c,v 1.14 2002/03/14 20:31:31 mickey Exp $ */
/* $NetBSD: osf1_misc.c,v 1.55 2000/06/28 15:39:33 mrg Exp $ */
/*
@@ -240,7 +240,7 @@ osf1_sys_uname(p, v, retval)
struct osf1_sys_uname_args *uap = v;
struct osf1_utsname u;
const char *cp;
- extern char ostype[], hostname[], osrelease[], version[], machine[];
+ extern char hostname[], machine[];
char *dp, *ep;
/* XXX would use stackgap, but our struct utsname is too big! */
diff --git a/sys/compat/sunos/sunos_misc.c b/sys/compat/sunos/sunos_misc.c
index b46a5c89020..69e0cd7c05e 100644
--- a/sys/compat/sunos/sunos_misc.c
+++ b/sys/compat/sunos/sunos_misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sunos_misc.c,v 1.36 2002/03/14 01:26:50 millert Exp $ */
+/* $OpenBSD: sunos_misc.c,v 1.37 2002/03/14 20:31:31 mickey Exp $ */
/* $NetBSD: sunos_misc.c,v 1.65 1996/04/22 01:44:31 christos Exp $ */
/*
@@ -636,7 +636,7 @@ sunos_sys_uname(p, v, retval)
{
struct sunos_sys_uname_args *uap = v;
struct sunos_utsname sut;
- extern char ostype[], machine[], osrelease[];
+ extern char machine[];
bzero(&sut, sizeof(sut));
diff --git a/sys/compat/svr4/svr4_stat.c b/sys/compat/svr4/svr4_stat.c
index d9698f40084..e72c58b1f81 100644
--- a/sys/compat/svr4/svr4_stat.c
+++ b/sys/compat/svr4/svr4_stat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: svr4_stat.c,v 1.21 2002/03/14 01:26:51 millert Exp $ */
+/* $OpenBSD: svr4_stat.c,v 1.22 2002/03/14 20:31:31 mickey Exp $ */
/* $NetBSD: svr4_stat.c,v 1.21 1996/04/22 01:16:07 christos Exp $ */
/*
@@ -523,8 +523,9 @@ svr4_sys_uname(p, v, retval)
{
struct svr4_sys_uname_args *uap = v;
struct svr4_utsname sut;
- extern char ostype[], hostname[], osrelease[], version[], machine[];
- char *cp, *dp, *ep;
+ extern char hostname[], machine[];
+ const char *cp;
+ char *dp, *ep;
bzero(&sut, sizeof(sut));
@@ -563,12 +564,11 @@ svr4_sys_systeminfo(p, v, retval)
register_t *retval;
{
struct svr4_sys_systeminfo_args *uap = v;
- char *str;
+ const char *str;
int name;
int error;
long len;
- extern char ostype[], hostname[], osrelease[],
- version[], machine[], domainname[];
+ extern char hostname[], machine[], domainname[];
#ifdef __sparc__
extern char *cpu_class;
#endif
diff --git a/sys/compat/ultrix/ultrix_misc.c b/sys/compat/ultrix/ultrix_misc.c
index 7860af1e99e..3dd59b3e51e 100644
--- a/sys/compat/ultrix/ultrix_misc.c
+++ b/sys/compat/ultrix/ultrix_misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ultrix_misc.c,v 1.25 2002/03/14 03:16:03 millert Exp $ */
+/* $OpenBSD: ultrix_misc.c,v 1.26 2002/03/14 20:31:31 mickey Exp $ */
/* $NetBSD: ultrix_misc.c,v 1.23 1996/04/07 17:23:04 jonathan Exp $ */
/*
@@ -401,7 +401,7 @@ ultrix_sys_uname(p, v, retval)
{
struct ultrix_sys_uname_args *uap = v;
struct ultrix_utsname sut;
- extern char ostype[], machine[], osrelease[];
+ extern char machine[];
bzero(&sut, sizeof(sut));
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 6cf195cac66..a2ebded46ce 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: newvers.sh,v 1.37 2001/12/04 00:05:10 niklas Exp $
+# $OpenBSD: newvers.sh,v 1.38 2002/03/14 20:31:31 mickey Exp $
# $NetBSD: newvers.sh,v 1.17.2.1 1995/10/12 05:17:11 jtc Exp $
#
# Copyright (c) 1984, 1986, 1990, 1993
@@ -66,11 +66,11 @@ ost="OpenBSD"
osr="3.0"
cat >vers.c <<eof
-char ostype[] = "${ost}";
-char osrelease[] = "${osr}";
-char osversion[] = "${id}#${v}";
-char sccs[8] = { ' ', ' ', ' ', ' ', '@', '(', '#', ')' };
-char version[] =
+const char ostype[] = "${ost}";
+const char osrelease[] = "${osr}";
+const char osversion[] = "${id}#${v}";
+const char sccs[8] = { ' ', ' ', ' ', ' ', '@', '(', '#', ')' };
+const char version[] =
"${ost} ${osr}-current (${id}) #${v}: ${t}\n ${u}@${h}:${d}\n";
eof
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index ed9437a6907..d46f5117eaa 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: init_main.c,v 1.93 2002/03/14 01:27:04 millert Exp $ */
+/* $OpenBSD: init_main.c,v 1.94 2002/03/14 20:31:31 mickey Exp $ */
/* $NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $ */
/*
@@ -98,7 +98,7 @@
extern void nfs_init(void);
#endif
-char copyright[] =
+const char copyright[] =
"Copyright (c) 1982, 1986, 1989, 1991, 1993\n"
"\tThe Regents of the University of California. All rights reserved.\n"
"Copyright (c) 1995-2002 OpenBSD. All rights reserved. http://www.OpenBSD.org\n";
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c
index b0cabd1e641..99b50f6d300 100644
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_sysctl.c,v 1.63 2002/03/14 19:42:54 mickey Exp $ */
+/* $OpenBSD: kern_sysctl.c,v 1.64 2002/03/14 20:31:31 mickey Exp $ */
/* $NetBSD: kern_sysctl.c,v 1.17 1996/05/20 17:49:05 mrg Exp $ */
/*-
@@ -241,7 +241,6 @@ kern_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p)
struct proc *p;
{
int error, level, inthostid, oldsgap;
- extern char ostype[], osrelease[], osversion[];
extern int somaxconn, sominconn;
extern int usermount, nosuidcoredump;
extern long cp_time[CPUSTATES];
diff --git a/sys/miscfs/kernfs/kernfs_vnops.c b/sys/miscfs/kernfs/kernfs_vnops.c
index ff757a8212b..6531b343ff8 100644
--- a/sys/miscfs/kernfs/kernfs_vnops.c
+++ b/sys/miscfs/kernfs/kernfs_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kernfs_vnops.c,v 1.26 2002/03/14 01:27:08 millert Exp $ */
+/* $OpenBSD: kernfs_vnops.c,v 1.27 2002/03/14 20:31:31 mickey Exp $ */
/* $NetBSD: kernfs_vnops.c,v 1.43 1996/03/16 23:52:47 christos Exp $ */
/*
@@ -74,7 +74,6 @@ static int posix = _POSIX_VERSION;
static int osrev = OpenBSD;
static int ncpu = 1; /* XXX */
extern char machine[], cpu_model[];
-extern char ostype[], osrelease[];
#ifdef IPSEC
extern int ipsp_kern(int, char **, int);
@@ -88,7 +87,7 @@ struct kern_target kern_targets[] = {
{ DT_DIR, N(".."), 0, KTT_NULL, VDIR, DIR_MODE },
{ DT_REG, N("boottime"), &boottime.tv_sec, KTT_INT, VREG, READ_MODE },
{ DT_REG, N("byteorder"), &byteorder, KTT_INT, VREG, READ_MODE },
- { DT_REG, N("copyright"), copyright, KTT_STRING, VREG, READ_MODE },
+ { DT_REG, N("copyright"), (void*)copyright,KTT_STRING, VREG, READ_MODE },
{ DT_REG, N("hostname"), 0, KTT_HOSTNAME, VREG, WRITE_MODE },
{ DT_REG, N("domainname"),0, KTT_DOMAIN, VREG, WRITE_MODE },
{ DT_REG, N("hz"), &hz, KTT_INT, VREG, READ_MODE },
@@ -97,9 +96,9 @@ struct kern_target kern_targets[] = {
{ DT_REG, N("model"), cpu_model, KTT_STRING, VREG, READ_MODE },
{ DT_REG, N("msgbuf"), 0, KTT_MSGBUF, VREG, READ_MODE },
{ DT_REG, N("ncpu"), &ncpu, KTT_INT, VREG, READ_MODE },
- { DT_REG, N("ostype"), &ostype, KTT_STRING, VREG, READ_MODE },
- { DT_REG, N("osrelease"), &osrelease, KTT_STRING, VREG, READ_MODE },
- { DT_REG, N("osrev"), &osrev, KTT_INT, VREG, READ_MODE },
+ { DT_REG, N("ostype"), (void*)&ostype,KTT_STRING, VREG, READ_MODE },
+ { DT_REG, N("osrelease"), (void*)&osrelease,KTT_STRING,VREG, READ_MODE },
+ { DT_REG, N("osrev"), &osrev, KTT_INT, VREG, READ_MODE },
{ DT_REG, N("pagesize"), &uvmexp.pagesize, KTT_INT, VREG, READ_MODE },
{ DT_REG, N("physmem"), &physmem, KTT_PHYSMEM, VREG, READ_MODE },
{ DT_REG, N("posix"), &posix, KTT_INT, VREG, READ_MODE },
@@ -110,7 +109,7 @@ struct kern_target kern_targets[] = {
{ DT_CHR, N("rrootdev"), &rrootdev, KTT_DEVICE, VCHR, READ_MODE },
{ DT_REG, N("time"), 0, KTT_TIME, VREG, READ_MODE },
{ DT_REG, N("usermem"), 0, KTT_USERMEM, VREG, READ_MODE },
- { DT_REG, N("version"), version, KTT_STRING, VREG, READ_MODE },
+ { DT_REG, N("version"), (void*)version,KTT_STRING, VREG, READ_MODE },
#ifdef IPSEC
{ DT_REG, N("ipsec"), 0, KTT_IPSECSPI, VREG, READ_MODE },
#endif
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index 07f322d0882..b78d46a638f 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: systm.h,v 1.48 2002/03/14 03:16:12 millert Exp $ */
+/* $OpenBSD: systm.h,v 1.49 2002/03/14 20:31:31 mickey Exp $ */
/* $NetBSD: systm.h,v 1.50 1996/06/09 04:55:09 briggs Exp $ */
/*-
@@ -76,8 +76,11 @@
*/
extern int securelevel; /* system security level */
extern const char *panicstr; /* panic message */
-extern char version[]; /* system version */
-extern char copyright[]; /* system copyright */
+extern const char version[]; /* system version */
+extern const char copyright[]; /* system copyright */
+extern const char ostype[];
+extern const char osversion[];
+extern const char osrelease[];
extern int cold; /* cold start flag initialized in locore */
extern int nblkdev; /* number of entries in bdevsw */