Merge from mainline.

1 files changed, 2 insertions, 1 deletions

diff --git a/src/termhooks.h b/src/termhooks.h
index 0ccd2dac9e1..2f509009bd9 100644
--- a/src/termhooks.h
+++ b/src/termhooks.h
@@ -306,7 +306,9 @@ enum {
 #ifdef HAVE_GPM
 #include <gpm.h>
 extern int handle_one_term_event (struct tty_display_info *, Gpm_Event *, struct input_event *);
+#ifndef HAVE_WINDOW_SYSTEM
 extern void term_mouse_moveto (int, int);
+#endif
 
 /* The device for which we have enabled gpm support.  */
 extern struct tty_display_info *gpm_tty;
@@ -660,4 +662,3 @@ extern unsigned char *encode_terminal_code (struct glyph *, int,
 #ifdef HAVE_GPM
 extern void close_gpm (int gpm_fd);
 #endif
-