summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2012-11-10 23:36:53 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2012-11-10 23:36:53 +0000
commitbb5d4d008b587d397c24d694cb8bc771520a7046 (patch)
treecd13e9238fc08bf99ede6e595ba7c6921f371120 /sys/dev
parenta134f8876ab88404aad8a25ef4a6566f88701455 (diff)
use boolean_t not bool for a local boolean type so this won't
clash with a c99 style bool type. ok millert@ deraadt@
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/isa/spkr.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/isa/spkr.c b/sys/dev/isa/spkr.c
index 9e19102606f..9771f79517a 100644
--- a/sys/dev/isa/spkr.c
+++ b/sys/dev/isa/spkr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spkr.c,v 1.13 2011/06/23 16:31:16 deraadt Exp $ */
+/* $OpenBSD: spkr.c,v 1.14 2012/11/10 23:36:52 jsg Exp $ */
/* $NetBSD: spkr.c,v 1.1 1998/04/15 20:26:18 drochner Exp $ */
/*
@@ -115,7 +115,7 @@ rest(ticks)
* except possibly at physical block boundaries.
*/
-typedef int bool;
+typedef int boolean_t;
#define TRUE 1
#define FALSE 0
@@ -127,8 +127,8 @@ static int octave; /* currently selected octave */
static int whole; /* whole-note time at current tempo, in ticks */
static int value; /* whole divisor for note time, quarter note = 1 */
static int fill; /* controls spacing of notes */
-static bool octtrack; /* octave-tracking on? */
-static bool octprefix; /* override current octave-tracking state? */
+static boolean_t octtrack; /* octave-tracking on? */
+static boolean_t octprefix; /* override current octave-tracking state? */
/*
* Magic number avoidance...