--- np2/sound/beepc.c	2004/07/04 08:30:16	1.10
+++ np2/sound/beepc.c	2011/01/15 18:04:43	1.12
@@ -105,7 +105,7 @@ static void beep_eventset(void) {
 
 	BPEVENT	*evt;
 	int		enable;
-	SINT32	clock;
+	SINT32	clk;
 
 	enable = beep.low & beep.buz;
 	if (beep.enable != enable) {
@@ -119,7 +119,7 @@ static void beep_eventset(void) {
 			tmp &= ~0x80000000;
 		}
 		bplog.event[bplog.events++] = tmp;
-		if (bplog.events >= (sizeof(bplog.event)/sizeof(UINT32))) {
+		if (bplog.events >= NELEMENTS(bplog.event)) {
 			beeplogflash();
 		}
 #endif
@@ -128,12 +128,12 @@ static void beep_eventset(void) {
 		}
 		beep.enable = enable;
 		if (beep.events < BEEPEVENT_MAX) {
-			clock = CPU_CLOCK + CPU_BASECLOCK - CPU_REMCLOCK;
+			clk = CPU_CLOCK + CPU_BASECLOCK - CPU_REMCLOCK;
 			evt = beep.event + beep.events;
 			beep.events++;
-			evt->clock = (clock - beep.clock) * beepcfg.samplebase;
+			evt->clock = (clk - beep.clock) * beepcfg.samplebase;
 			evt->enable = enable;
-			beep.clock = clock;
+			beep.clock = clk;
 		}
 	}
 }