[src/trunk]: src/sys/dev/usb Fix ifdef botch in previous revision:

[jonathan <jonathan%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8e5dbbc2d4f5
branches:  trunk
changeset: 580681:8e5dbbc2d4f5
user:      jonathan <jonathan%NetBSD.org@localhost>
date:      Tue May 03 18:37:46 2005 +0000

description:
Fix ifdef botch in previous revision:

The `Static' forward declaration of ukbd_rawrepeat was inside #ifdef
UKBD_REPEAT but not #ifdef DISPLAY_COMPAT_RAWCKBD. The definition and
all other references are inside both #ifdefs.  The `static' function
declaration with no definition failed GCC warnings.

Pass GCC warnings by wrapping  the declaration with a check that both
CPP tokens are defined.

diffstat:

 sys/dev/usb/ukbd.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r eda211ea993d -r 8e5dbbc2d4f5 sys/dev/usb/ukbd.c
--- a/sys/dev/usb/ukbd.c        Tue May 03 16:26:27 2005 +0000
+++ b/sys/dev/usb/ukbd.c        Tue May 03 18:37:46 2005 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: ukbd.c,v 1.87 2005/05/03 13:15:21 augustss Exp $        */
+/*      $NetBSD: ukbd.c,v 1.88 2005/05/03 18:37:46 jonathan Exp $        */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.87 2005/05/03 13:15:21 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.88 2005/05/03 18:37:46 jonathan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -249,7 +249,7 @@
 
 #if defined(__NetBSD__)
 Static int     ukbd_ioctl(void *, u_long, caddr_t, int, usb_proc_ptr );
-#ifdef WSDISPLAY_COMPAT_RAWKBD
+#if  defined(WSDISPLAY_COMPAT_RAWKBD) && defined(UKBD_REPEAT)
 Static void    ukbd_rawrepeat(void *v);
 #endif