summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorjmallett <jmallett@FreeBSD.org>2003-06-09 18:19:33 +0000
committerjmallett <jmallett@FreeBSD.org>2003-06-09 18:19:33 +0000
commit2f59062691ada0becd88dc6be4a165331b540fd3 (patch)
tree134c95d3a59ac2e7ce702d900f7f932b7dde4b91 /sys
parentccd243b6dab1fb27d3bd852e7faa849b0101a219 (diff)
downloadFreeBSD-src-2f59062691ada0becd88dc6be4a165331b540fd3.zip
FreeBSD-src-2f59062691ada0becd88dc6be4a165331b540fd3.tar.gz
Attempt to fix Alpha build by renaming ident[] to kern_ident[].
Diffstat (limited to 'sys')
-rw-r--r--sys/conf/newvers.sh2
-rw-r--r--sys/kern/kern_mib.c2
-rw-r--r--sys/sys/sysctl.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index d27e926..0cce419 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -95,7 +95,7 @@ char version[] = "${VERSION} #${v}: ${t}\\n ${u}@${h}:${d}\\n";
char ostype[] = "${TYPE}";
char osrelease[] = "${RELEASE}";
int osreldate = ${RELDATE};
-char ident[] = "${i}";
+char kern_ident[] = "${i}";
EOF
echo `expr ${v} + 1` > version
diff --git a/sys/kern/kern_mib.c b/sys/kern/kern_mib.c
index 6e236f6..9fed2d2 100644
--- a/sys/kern/kern_mib.c
+++ b/sys/kern/kern_mib.c
@@ -86,7 +86,7 @@ SYSCTL_NODE(, OID_AUTO, regression, CTLFLAG_RW, 0,
#endif
SYSCTL_STRING(_kern, OID_AUTO, ident, CTLFLAG_RD,
- ident, 0, "Kernel identifier");
+ kern_ident, 0, "Kernel identifier");
SYSCTL_STRING(_kern, KERN_OSRELEASE, osrelease, CTLFLAG_RD,
osrelease, 0, "Operating system release");
diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h
index 68e6659..5915808 100644
--- a/sys/sys/sysctl.h
+++ b/sys/sys/sysctl.h
@@ -581,7 +581,7 @@ SYSCTL_DECL(_compat);
extern char machine[];
extern char osrelease[];
extern char ostype[];
-extern char ident[];
+extern char kern_ident[];
/* Dynamic oid handling */
struct sysctl_oid *sysctl_add_oid(struct sysctl_ctx_list *clist,
OpenPOWER on IntegriCloud