summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorasomers <asomers@FreeBSD.org>2016-05-24 00:14:58 +0000
committerasomers <asomers@FreeBSD.org>2016-05-24 00:14:58 +0000
commit69a8601e63c4e7e77f91dcf55e2456972c53d030 (patch)
treea57f8314e8aa5da200052f99dc85a63d95308f67
parent63911f45771c4b025ae6817a985915a78927b27c (diff)
downloadFreeBSD-src-69a8601e63c4e7e77f91dcf55e2456972c53d030.zip
FreeBSD-src-69a8601e63c4e7e77f91dcf55e2456972c53d030.tar.gz
Fix build of kern/subr_unit.c, broken by r300539
Reported by: peter Pointyhat to: asomers Sponsored by: Spectra Logic Corp
-rw-r--r--sys/kern/subr_unit.c6
-rw-r--r--sys/sys/bitstring.h3
2 files changed, 5 insertions, 4 deletions
diff --git a/sys/kern/subr_unit.c b/sys/kern/subr_unit.c
index 4d784e6..5a62762 100644
--- a/sys/kern/subr_unit.c
+++ b/sys/kern/subr_unit.c
@@ -984,9 +984,9 @@ main(int argc, char **argv)
struct unrhdr *uh;
char *a;
long count = 10000; /* Number of unrs to test */
- long reps = 1;
+ long reps = 1, m;
int ch;
- u_int i, x, m, j;
+ u_int i, x, j;
verbose = false;
@@ -1043,7 +1043,7 @@ main(int argc, char **argv)
print_unrhdr(uh);
check_unrhdr(uh, __LINE__);
}
- for (i = 0; i < count; i++) {
+ for (i = 0; i < (u_int)count; i++) {
if (a[i]) {
if (verbose) {
printf("C %u\n", i);
diff --git a/sys/sys/bitstring.h b/sys/sys/bitstring.h
index 9659dba..fa0ee19 100644
--- a/sys/sys/bitstring.h
+++ b/sys/sys/bitstring.h
@@ -65,9 +65,10 @@
#ifdef _KERNEL
#include <sys/libkern.h>
#include <sys/malloc.h>
-#include <sys/types.h>
#endif
+#include <sys/types.h>
+
typedef unsigned long bitstr_t;
/*---------------------- Private Implementation Details ----------------------*/
OpenPOWER on IntegriCloud