--- a/src/events.c	Mon Oct 18 21:51:40 2004 +0000
+++ b/src/events.c	Tue Oct 19 17:19:07 2004 +0000
@@ -41,6 +41,18 @@
 
 #include "console-tty-impl.h" /* for stuff in character_to_event */
 
+#ifdef HAVE_TTY
+#define USED_IF_TTY(decl) decl
+#else
+#define USED_IF_TTY(decl) UNUSED (decl)
+#endif
+
+#ifdef HAVE_TOOLBARS
+#define USED_IF_TOOLBARS(decl) decl
+#else
+#define USED_IF_TOOLBARS(decl) UNUSED (decl)
+#endif
+
 /* Where old events go when they are explicitly deallocated.
    The event chain here is cut loose before GC, so these will be freed
    eventually.
@@ -1210,7 +1222,8 @@
 
 void
 character_to_event (Ichar c, Lisp_Event *event, struct console *con,
-		    int use_console_meta_flag, int do_backspace_mapping)
+		    int use_console_meta_flag,
+		    int USED_IF_TTY (do_backspace_mapping))
 {
   Lisp_Object k = Qnil;
   int m = 0;
@@ -2383,7 +2396,7 @@
 Return the toolbar button that the mouse event EVENT occurred over.
 If the event did not occur over a toolbar button, nil is returned.
 */
-       (event))
+       (USED_IF_TOOLBARS (event)))
 {
 #ifdef HAVE_TOOLBARS
   Lisp_Object button;