diff src/frame.h @ 111346:2d0c056a50d8

Fix unified mouse highlight after compiling on Unix. xdisp.c (x_consider_frame_title, tool_bar_lines_needed): Move prototypes to HAVE_WINDOW_SYSTEM-only part. frame.h (MOUSE_HL_INFO): Fix definition to work both for TTY-only and GUI builds.

--- a/src/frame.h	Fri Nov 05 14:11:22 2010 +0200
+++ b/src/frame.h	Fri Nov 05 20:07:42 2010 +0200
@@ -546,11 +546,17 @@
 
 /* Return a pointer to the structure holding information about the
    region of text, if any, that is currently shown in mouse-face on
-   frame F.  */
-#define MOUSE_HL_INFO(F)				\
-  (FRAME_WINDOW_P(F)					\
-   ? &(FRAME_X_DISPLAY_INFO(F)->mouse_highlight)	\
-   : &(((F)->output_data.tty->display_info)->mouse_highlight))
+   frame F.  We need to define two versions because a TTY-only build
+   does not have FRAME_X_DISPLAY_INFO.  */
+#ifdef HAVE_WINDOW_SYSTEM
+# define MOUSE_HL_INFO(F)					\
+   (FRAME_WINDOW_P(F)						\
+    ? &(FRAME_X_DISPLAY_INFO(F)->mouse_highlight)		\
+    : &(((F)->output_data.tty->display_info)->mouse_highlight))
+#else
+# define MOUSE_HL_INFO(F)					\
+    (&(((F)->output_data.tty->display_info)->mouse_highlight))
+#endif
 
 /* Nonzero if frame F is still alive (not deleted).  */
 #define FRAME_LIVE_P(f) ((f)->terminal != 0)