* cl-generic.el (cl-defmethod): Make docstring dynamic

[gnu-emacs] / src / w32term.h

diff --git a/src/w32term.h b/src/w32term.h
index e134da5ea5c9d3e93f12dce0edf45f9592b7e05c..3934e8500a306cc853c504efb5cefc5e0526cf13 100644 (file)
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -186,6 +186,9 @@ struct w32_display_info
   /* The frame waiting to be auto-raised in w32_read_socket.  */
   struct frame *w32_pending_autoraise_frame;
 
+  /* Tooltip frame on this display.  */
+  struct frame *w32_tooltip_frame;
+
   /* The frame where the mouse was last time we reported a mouse event.  */
   struct frame *last_mouse_frame;
 
@@ -399,7 +402,7 @@ extern struct w32_output w32term_display;
 #define FRAME_BASELINE_OFFSET(f) ((f)->output_data.w32->baseline_offset)
 
 /* This gives the w32_display_info structure for the display F is on.  */
-#define FRAME_DISPLAY_INFO(f) (&one_w32_display_info)
+#define FRAME_DISPLAY_INFO(f) ((void) (f), (&one_w32_display_info))
 
 /* This is the `Display *' which frame F is on.  */
 #define FRAME_X_DISPLAY(f) (0)